[FIX] resolve Conflicts reverts
[odoo/odoo.git] / addons / web_diagram / static / src / xml /
drwxr-xr-x   ..
-rw-r--r-- 767 base_diagram.xml