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

[MERGE] website: remove duplicate entries in POT file

Browse Source 
Before this commit the merge operation did not decide which entry to
keep.

After this commit the merge is solved.

#63534

closes odoo/odoo#63553

X-original-commit: 33a482be1aa7162f446ff5cdda35ba2f7ce1f273
Related: odoo/design-themes#434
Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
This commit is contained in:
Benoit Socias
2020-12-17 16:55:30 +00:00
parent 337434428e
commit 8b80ae444b
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/i18n/website.pot
-5
View File
@@ -6,13 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server saas~14.1\n"
"Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2020-12-11 07:28+0000\n"
"PO-Revision-Date: 2020-12-11 07:28+0000\n"
=======
"POT-Creation-Date: 2020-12-04 15:13+0000\n"
"PO-Revision-Date: 2020-12-04 15:13+0000\n"
>>>>>>> 15beef60b52... temp
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"