From 11fcfa2b07d3d92ef48630542e39db926a53ac43 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Fri, 17 Aug 2012 16:37:35 +0200
Subject: [PATCH] fix removed a useless line in sass

bzr revid: mit@openerp.com-20120817143735-hverq9jb72kn2zdb
---
 addons/web/static/src/css/base.sass | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 4c190549639..6472f7aaacd 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1512,7 +1512,6 @@ $sheet-max-width: 860px
             position: relative
             border-bottom: 1px solid #cacaca
             @include vertical-gradient(#fcfcfc, #dedede)
->>>>>>> MERGE-SOURCE
             ul
                 display: inline-block
                 float: right