[IMP] remove conflict

bzr revid: tpa@tinyerp.com-20111213060433-s92xmflr48p9wny1
2011-12-13 11:34:33 +05:30
parent 23129a004d
commit 5f583e89c0
1 changed files with 0 additions and 3 deletions
@@ -44,10 +44,7 @@ Features
    "demo_xml": ["project_long_term_demo.xml"],
    "test": [
          'test/phase_process.yml',
-<<<<<<< TREE
          'test/task_process.yml',
-=======
->>>>>>> MERGE-SOURCE
    ],
    "update_xml": [
        "security/ir.model.access.csv",