From 8b80ae444b22cab97d9e077c2943f7c8b6ae86e7 Mon Sep 17 00:00:00 2001 From: Benoit Socias Date: Thu, 17 Dec 2020 14:22:20 +0000 Subject: [PATCH] [MERGE] website: remove duplicate entries in POT file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) --- addons/website/i18n/website.pot | 5 ----- 1 file changed, 5 deletions(-) diff --git a/addons/website/i18n/website.pot b/addons/website/i18n/website.pot index fcab9e69398..97c57d00bda 100644 --- a/addons/website/i18n/website.pot +++ b/addons/website/i18n/website.pot @@ -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"