From 94f2c6d093be6ab6be74ca283c8a16247c9fe5d9 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 28 Apr 2011 10:21:56 +0530
Subject: [PATCH] [REMOVE]: Remove conflict

bzr revid: atp@tinyerp.com-20110428045156-ssluwcxhtc575tnz
---
 addons/import_sugarcrm/import_sugarcrm.py | 24 ++---------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/addons/import_sugarcrm/import_sugarcrm.py b/addons/import_sugarcrm/import_sugarcrm.py
index 7c5fa2a6203..6442c9f9bc7 100644
--- a/addons/import_sugarcrm/import_sugarcrm.py
+++ b/addons/import_sugarcrm/import_sugarcrm.py
@@ -1182,11 +1182,7 @@ MAP_FIELDS = {'Opportunities':  #Object Mapping name
                      'process' : import_leads,
                     },
               'Contacts':
-<<<<<<< TREE
                     {'dependencies' : ['Users', 'Accounts'],  #Object to import before this table
-=======
-                    {'dependencies' : [],  #Object to import before this table
->>>>>>> MERGE-SOURCE
                      'process' : import_partner_address,
                     },
               'Accounts':
@@ -1212,23 +1208,7 @@ MAP_FIELDS = {'Opportunities':  #Object Mapping name
               'Calls': 
                     {'dependencies' : ['Accounts', 'Contacts', 'Users', 'Opportunities'],
                      'process' : import_calls,
-<<<<<<< TREE
-                    }, 
-              'Claims': 
-                    {'dependencies' : ['Users', 'Accounts', 'Contacts', 'Leads'],
-                     'process' : import_claims,
-                    },
-              'Employees': 
-                    {'dependencies' : ['Resources'],
-                     'process' : import_employees,
-                    },
-              'Emails': 
-                    {'dependencies' : ['Users', 'Projects', 'Project Tasks', 'Accounts', 'Contacts', 'Leads', 'Opportunities', 'Meetings', 'Calls'],
-                     'process' : import_emails,
-                    },    
-=======
                     },  
->>>>>>> MERGE-SOURCE
               'Projects': 
                     {'dependencies' : ['Users', 'Accounts', 'Contacts'],
                      'process' : import_projects,
@@ -1243,12 +1223,12 @@ MAP_FIELDS = {'Opportunities':  #Object Mapping name
                     },                         
               
               'Emails': 
-                    {'dependencies' : ['Users'],
+                    {'dependencies' : ['Users', 'Projects', 'Project Tasks', 'Accounts', 'Contacts', 'Leads', 'Opportunities', 'Meetings', 'Calls'],
                      'process' : import_emails,
                     },    
               
               'Notes': 
-                    {'dependencies' : [],
+                    {'dependencies' : ['Users', 'Projects', 'Project Tasks', 'Accounts', 'Contacts', 'Leads', 'Opportunities', 'Meetings', 'Calls'],
                      'process' : import_history,
                     },  
               'Employees':