Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
solved conflict with the translation name and team
  • Loading branch information
clacri committed May 3, 2020
commit c07e198e7d6f9ef7031354223ced20625dedc52d
2 changes: 2 additions & 0 deletions tutorial/whatnow.po
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-06 11:59-0400\n"
"PO-Revision-Date: 2020-05-03 11:45+0200\n"
"Last-Translator: Claudia Millan <clmilneb@gmail.com>\n"
"Language-Team: python-doc-es (https://mail.python.org/mailman3/lists/docs-es.python.org)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.