Skip to content

Traduccion whatsnew 3.9 #2118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Oct 30, 2022
Prev Previous commit
Next Next commit
Arreglo conflicto
  • Loading branch information
JuliKM authored Dec 18, 2021
commit eda19b8387af703cc2e8e7e5b53473e8d8aed9c0
8 changes: 0 additions & 8 deletions library/security_warnings.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 ""
Expand Down