Merge branch 'traduccion-datamodel' of github.com:JuliKM/python-docs-es into traduccion-datamodel

JuliKM · JuliKM · commit c37dfa0dd365 · 2021-12-09T23:28:21.000-03:00
diff --git a/library/security_warnings.po b/library/security_warnings.po
@@ -9,11 +9,7 @@ msgstr ""
 "Project-Id-Version: Python en Español 3.10\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-16 21:42+0200\n"
-<<<<<<< HEAD
 "PO-Revision-Date: 2021-10-30 11:49-0300\n"
-=======
-"PO-Revision-Date: 2021-10-30 11:31-0300\n"
->>>>>>> 451fe725c28e4b56b001cdc540f2d8a33325cfca
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -53,11 +49,7 @@ msgid ""
 msgstr ""
 ":mod:`hashlib`: :ref:`todos los constructores toman un argumento de solo "
 "palabra clave \"usedforsecurity\" que deshabilita algoritmos inseguros y "
-<<<<<<< HEAD
 "bloqueados conocidos <hashlib-usedforsecurity>`"
-=======
-"bloqueados conocidos. <hashlib-usedforsecurity>`"
->>>>>>> 451fe725c28e4b56b001cdc540f2d8a33325cfca
 
 #: ../Doc/library/security_warnings.rst:16
 msgid ""
