summaryrefslogtreecommitdiff
path: root/addons/web/static/src/xml/base.xml
diff options
context:
space:
mode:
authorRoberto López López (OpenERP) <rlo@openerp.com>2011-12-23 13:55:14 +0100
committerRoberto López López (OpenERP) <rlo@openerp.com>2011-12-23 13:55:14 +0100
commit9d50e87a25589e6f9f1408d464e0c3143593ffa3 (patch)
tree74d3cb3289a1b17c0b3ac8f870cf724d71e91f40 /addons/web/static/src/xml/base.xml
parentab3d6750c1441e50d0946eb8b549b198bf78f399 (diff)
remove merge lines from CSS
bzr revid: rlo@openerp.com-20111223125514-fxj6jgwme2az5e5x
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
0 files changed, 0 insertions, 0 deletions