merged

Author: mgiannopoulos24

library/platform.po

@@ -8,18 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.12\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
 "POT-Creation-Date: 2024-03-14 12:51+0000\n"
 "PO-Revision-Date: 2025-02-14 17:10+0200\n"
 "Last-Translator: Marios Giannopoulos <[email protected]>\n"
 "Language-Team: PyGreece <[email protected]>\n"
-=======
-"POT-Creation-Date: 2025-02-17 21:03+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
 "Language: \n"
->>>>>>> origin/3.12
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -510,10 +503,7 @@ msgstr ""
 
 #: library/platform.rst:289
 msgid "Example::"
-<<<<<<< HEAD
 msgstr "Παράδειγμα::"
-=======
-msgstr ""
 
 #: library/platform.rst:291
 msgid ""
@@ -525,4 +515,3 @@ msgid ""
 "        ids.extend(info[\"ID_LIKE\"].split())\n"
 "    return ids"
 msgstr ""
->>>>>>> origin/3.12