Traducido c-api/memory.po

Author: kbiggers

c-api/memory.po

@@ -11,11 +11,7 @@ msgstr ""
 "Project-Id-Version: Python 3.11\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-11-21 16:38-0300\n"
-<<<<<<< HEAD
-"PO-Revision-Date: 2025-02-02 10:07-0500\n"
-=======
 "PO-Revision-Date: 2025-02-10 12:41-0500\n"
->>>>>>> 6fe1a5cf (Traducido c-api/memory.po)
 "Last-Translator: Marco Richetta <marcorichetta@gmail.com>\n"
 "Language-Team: python-doc-es\n"
 "Language: es\n"