[IMP] Remove conflict

bzr revid: ksa@tinyerp.co.in-20100601060821-15gm6j5jqgn3nhss

7 files changed, 0 insertions, 28 deletions

diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po
index be9a9612f42..09125a2706f 100644
--- a/addons/account/i18n/cs.po
+++ b/addons/account/i18n/cs.po
@@ -13,11 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< TREE
-"X-Launchpad-Export-Date: 2010-04-03 03:54+0000\n"
-=======
 "X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
->>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account_payment/i18n/cs.po b/addons/account_payment/i18n/cs.po
index 1b10c28c59e..eec828ea2ae 100644
--- a/addons/account_payment/i18n/cs.po
+++ b/addons/account_payment/i18n/cs.po
@@ -13,11 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< TREE
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
-=======
 "X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
->>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/base_contact/i18n/ko.po b/addons/base_contact/i18n/ko.po
index d209a3d2db3..a5dbaad3f46 100644
--- a/addons/base_contact/i18n/ko.po
+++ b/addons/base_contact/i18n/ko.po
@@ -14,11 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< TREE
-"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
-=======
 "X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
->>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po
index d8d7144e92c..ee51240f4c7 100644
--- a/addons/crm/i18n/fi.po
+++ b/addons/crm/i18n/fi.po
@@ -14,11 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< TREE
-"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
-=======
 "X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
->>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/hr_timesheet/i18n/de.po b/addons/hr_timesheet/i18n/de.po
index 8da6cb5fbef..c0dc16b4145 100644
--- a/addons/hr_timesheet/i18n/de.po
+++ b/addons/hr_timesheet/i18n/de.po
@@ -13,11 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< TREE
-"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
-=======
 "X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
->>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/report_purchase/i18n/ko.po b/addons/report_purchase/i18n/ko.po
index 3fc2f47e73f..4bdec1193dd 100644
--- a/addons/report_purchase/i18n/ko.po
+++ b/addons/report_purchase/i18n/ko.po
@@ -14,11 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< TREE
-"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
-=======
 "X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
->>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/scrum/i18n/ko.po b/addons/scrum/i18n/ko.po
index 7715e88937c..53022cb34d4 100644
--- a/addons/scrum/i18n/ko.po
+++ b/addons/scrum/i18n/ko.po
@@ -14,11 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< TREE
-"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
-=======
 "X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
->>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum