summaryrefslogtreecommitdiff
path: root/addons/web/static/src/css/base.sass
diff options
context:
space:
mode:
authorMinh Tran <mit@openerp.com>2012-08-17 16:37:35 +0200
committerMinh Tran <mit@openerp.com>2012-08-17 16:37:35 +0200
commit11fcfa2b07d3d92ef48630542e39db926a53ac43 (patch)
tree4553b162638210b77a300dde54201e46b296daa4 /addons/web/static/src/css/base.sass
parentf4723d16d03a2a1e4a759c37bdf2a3cf820ecd50 (diff)
fix removed a useless line in sass
bzr revid: mit@openerp.com-20120817143735-hverq9jb72kn2zdb
Diffstat (limited to 'addons/web/static/src/css/base.sass')
-rw-r--r--addons/web/static/src/css/base.sass1
1 files changed, 0 insertions, 1 deletions
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