pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] Remove conflict

Browse Source 
bzr revid: ksa@tinyerp.co.in-20100601060821-15gm6j5jqgn3nhss
This commit is contained in:
ksa (Open ERP)
2010-06-01 11:38:21 +05:30
parent 62bfe8dcaf
commit b0bd8bce74
7 changed files with 0 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/i18n/cs.po
-4
View File
@@ -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
addons/account_payment/i18n/cs.po
-4
View File
@@ -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
addons/base_contact/i18n/ko.po
-4
View File
@@ -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
addons/crm/i18n/fi.po
-4
View File
@@ -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
addons/hr_timesheet/i18n/de.po
-4
View File
@@ -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
addons/report_purchase/i18n/ko.po
-4
View File
@@ -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
addons/scrum/i18n/ko.po
-4
View File
@@ -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