Updated messages.po

diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index 46cefc9b0d4089621a0d6d2e5284db0f26ac443d..7860e4b4bb3f9b383b8a0ad6be542bf83b05b4c2 100644 (file)
--- 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"