From 2ff1ba4ed1de360cf9a98ab40bb86b2947809b9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= Date: Mon, 1 Nov 2021 18:38:58 +0100 Subject: [PATCH] Fix wrongly commited conflicting files --- ihatemoney/translations/cs/LC_MESSAGES/messages.po | 4 ---- ihatemoney/translations/fa/LC_MESSAGES/messages.po | 4 ---- ihatemoney/translations/kn/LC_MESSAGES/messages.po | 4 ---- ihatemoney/translations/ms/LC_MESSAGES/messages.po | 4 ---- ihatemoney/translations/nb_NO/LC_MESSAGES/messages.po | 4 ---- ihatemoney/translations/sr/LC_MESSAGES/messages.po | 4 ---- 6 files changed, 24 deletions(-) diff --git a/ihatemoney/translations/cs/LC_MESSAGES/messages.po b/ihatemoney/translations/cs/LC_MESSAGES/messages.po index d39a5bd7..27f09140 100644 --- a/ihatemoney/translations/cs/LC_MESSAGES/messages.po +++ b/ihatemoney/translations/cs/LC_MESSAGES/messages.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD "POT-Creation-Date: 2021-11-01 18:01+0100\n" -======= -"POT-Creation-Date: 2021-10-26 23:38+0200\n" ->>>>>>> master "PO-Revision-Date: 2021-09-05 13:34+0000\n" "Last-Translator: Clonewayx \n" "Language: cs\n" diff --git a/ihatemoney/translations/fa/LC_MESSAGES/messages.po b/ihatemoney/translations/fa/LC_MESSAGES/messages.po index f25b2a17..2ed7dd74 100644 --- a/ihatemoney/translations/fa/LC_MESSAGES/messages.po +++ b/ihatemoney/translations/fa/LC_MESSAGES/messages.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD "POT-Creation-Date: 2021-11-01 18:01+0100\n" -======= -"POT-Creation-Date: 2021-10-26 23:38+0200\n" ->>>>>>> master "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language: fa\n" diff --git a/ihatemoney/translations/kn/LC_MESSAGES/messages.po b/ihatemoney/translations/kn/LC_MESSAGES/messages.po index 517912c5..f790b17e 100644 --- a/ihatemoney/translations/kn/LC_MESSAGES/messages.po +++ b/ihatemoney/translations/kn/LC_MESSAGES/messages.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD "POT-Creation-Date: 2021-11-01 18:01+0100\n" -======= -"POT-Creation-Date: 2021-10-26 23:38+0200\n" ->>>>>>> master "PO-Revision-Date: 2021-10-17 04:56+0000\n" "Last-Translator: a-g-rao \n" "Language: kn\n" diff --git a/ihatemoney/translations/ms/LC_MESSAGES/messages.po b/ihatemoney/translations/ms/LC_MESSAGES/messages.po index 8d8748c1..d176bf73 100644 --- a/ihatemoney/translations/ms/LC_MESSAGES/messages.po +++ b/ihatemoney/translations/ms/LC_MESSAGES/messages.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD "POT-Creation-Date: 2021-11-01 18:01+0100\n" -======= -"POT-Creation-Date: 2021-10-26 23:38+0200\n" ->>>>>>> master "PO-Revision-Date: 2021-07-18 12:32+0000\n" "Last-Translator: Kemystra \n" "Language: ms\n" diff --git a/ihatemoney/translations/nb_NO/LC_MESSAGES/messages.po b/ihatemoney/translations/nb_NO/LC_MESSAGES/messages.po index b08e6176..a2205820 100644 --- a/ihatemoney/translations/nb_NO/LC_MESSAGES/messages.po +++ b/ihatemoney/translations/nb_NO/LC_MESSAGES/messages.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD "POT-Creation-Date: 2021-11-01 18:01+0100\n" -======= -"POT-Creation-Date: 2021-10-26 23:38+0200\n" ->>>>>>> master "PO-Revision-Date: 2021-07-18 20:48+0000\n" "Last-Translator: Allan Nordhøy \n" "Language: nb_NO\n" diff --git a/ihatemoney/translations/sr/LC_MESSAGES/messages.po b/ihatemoney/translations/sr/LC_MESSAGES/messages.po index c5307723..b05262c8 100644 --- a/ihatemoney/translations/sr/LC_MESSAGES/messages.po +++ b/ihatemoney/translations/sr/LC_MESSAGES/messages.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD "POT-Creation-Date: 2021-11-01 18:01+0100\n" -======= -"POT-Creation-Date: 2021-10-26 23:38+0200\n" ->>>>>>> master "PO-Revision-Date: 2021-04-09 13:26+0000\n" "Last-Translator: Rastko Sarcevic \n" "Language: sr\n"