From: Michael <heluecht@pirati.ca>
Date: Wed, 12 Jan 2022 21:29:18 +0000 (+0000)
Subject: Updated messages.po
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1f03462f2aced402f5a3d69da46ed0f930e8023c;p=friendica.git

Updated messages.po
---

diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index 46cefc9b0d..7860e4b4bb 100644
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -8,11 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2021.12-rc\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2022-01-12 21:16+0000\n"
-=======
-"POT-Creation-Date: 2022-01-09 12:31-0500\n"
->>>>>>> upstream/2021.12-rc
+"POT-Creation-Date: 2022-01-12 21:28+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"