summaryrefslogtreecommitdiff
path: root/addons/web/static/src/css
diff options
context:
space:
mode:
Diffstat (limited to 'addons/web/static/src/css')
-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