revert pso merge because of conflicts

[odoo/odoo.git] / addons / document / __terp__.py

diff --git a/addons/document/__terp__.py b/addons/document/__terp__.py
index e6bbfcc..6c6aa6a 100644 (file)
--- a/addons/document/__terp__.py
+++ b/addons/document/__terp__.py
@@ -30,18 +30,6 @@
     * User Authentification
     * Document Indexation
 """,
-<<<<<<< TREE
-       "depends" : ["base"],
-       "init_xml" : ["document_data.xml"],
-       "update_xml" : [
-               "document_view.xml",
-               "security/document_security.xml",
-               "security/ir.model.access.csv",
-       ],
-       "demo_xml" : ["document_demo.xml"],
-       "active": False,
-       "installable": True
-=======
     "depends" : ["base","process"],
     "init_xml" : [
         "document_data.xml",
@@ -56,5 +44,4 @@
     "demo_xml" : [],
     "active": False,
     "installable": True
->>>>>>> MERGE-SOURCE
 }