fix removed a useless line in sass

bzr revid: mit@openerp.com-20120817143735-hverq9jb72kn2zdb
2012-08-17 16:37:35 +02:00 · 2012-08-17 16:37:35 +02:00 · 11fcfa2b07
parent f4723d16d0
commit 11fcfa2b07
1 changed files with 0 additions and 1 deletions
--- 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