Update library/zipimport.po

qagustina · clacri · web-flow · commit d901cb637a28 · 2020-05-13T12:02:22.000-03:00
Co-authored-by: Claudia Millán &lt;clmilneb@gmail.com&gt;
diff --git a/library/zipimport.po b/library/zipimport.po
@@ -10,15 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.8\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2019-05-06 11:59-0400\n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: \n"
-=======
 "PO-Revision-Date: 2020-05-09 16:44-0300\n"
 "Language-Team: python-doc-es\n"
->>>>>>> 1def2792b0939a0beb1d1fb24efd4204e79c6256
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
