Fixed format

Author: Francisco Mora

c-api/number.po

@@ -11,11 +11,7 @@ msgstr ""
 "Project-Id-Version: Python 3.8\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-11-21 16:38-0300\n"
-<<<<<<< HEAD
-"PO-Revision-Date: 2025-02-03 09:07-0300\n"
-=======
-"PO-Revision-Date: 2025-02-03 17:14-0300\n"
->>>>>>> upstream/3.13
+"PO-Revision-Date: 2025-02-05 17:10-0300\n"
 "Last-Translator: srmorita <fr.morac@duocuc.cl>\n"
 "Language-Team: python-doc-es\n"
 "Language: es\n"
@@ -438,24 +434,15 @@ msgid ""
 "``tp_as_number`` structure filled in), and ``0`` otherwise. This function "
 "always succeeds."
 msgstr ""
-<<<<<<< HEAD
-"Devuelve ``1`` si *o* es un entero índice (tiene la ranura ``nb_index`` de "
-"la estructura ``tp_as_number`` rellenada), y ``0`` en caso contrario. Esta "
-=======
 "Retorna ``1`` si *o* es un entero índice (tiene la ranura ``nb_index`` de la "
 "estructura ``tp_as_number`` rellenada), y ``0`` en caso contrario. Esta "
->>>>>>> upstream/3.13
 "función siempre finaliza con éxito."
 
 #: ../Doc/c-api/number.rst:67 ../Doc/c-api/number.rst:75
 #: ../Doc/c-api/number.rst:97 ../Doc/c-api/number.rst:195
 #: ../Doc/c-api/number.rst:241 ../Doc/c-api/number.rst:249
 msgid "built-in function"
-<<<<<<< HEAD
-msgstr "función incorporada"
-=======
 msgstr "built-in function"
->>>>>>> upstream/3.13
 
 #: ../Doc/c-api/number.rst:67
 msgid "divmod"