From 5f583e89c05851337b3827abbb8cc5c3ecb98440 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Tue, 13 Dec 2011 11:34:33 +0530
Subject: [PATCH] [IMP] remove conflict

bzr revid: tpa@tinyerp.com-20111213060433-s92xmflr48p9wny1
---
 addons/project_long_term/__openerp__.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index abd8ca38bbe..e53fed203d2 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -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",