diff options
| author | Roberto López López (OpenERP) <rlo@openerp.com> | 2011-12-23 13:55:14 +0100 |
|---|---|---|
| committer | Roberto López López (OpenERP) <rlo@openerp.com> | 2011-12-23 13:55:14 +0100 |
| commit | 9d50e87a25589e6f9f1408d464e0c3143593ffa3 (patch) | |
| tree | 74d3cb3289a1b17c0b3ac8f870cf724d71e91f40 /addons/web/static/src/css | |
| parent | ab3d6750c1441e50d0946eb8b549b198bf78f399 (diff) | |
remove merge lines from CSS
bzr revid: rlo@openerp.com-20111223125514-fxj6jgwme2az5e5x
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 54ba44f2473..96d56b6104f 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2012,7 +2012,6 @@ ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-after { background-position: 0px -21px; } ->>>>>>> MERGE-SOURCE /* Buttons */ .openerp .oe_button:link, .openerp .oe_button:visited, @@ -2104,7 +2103,6 @@ ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-after { color: #aaaaaa !important; cursor: default; text-shadow: 0 1px 1px white !important; ->>>>>>> MERGE-SOURCE } /* Login page */ |