Update library/frameworks.po

eflipe · cmaureir · web-flow · commit 48f85fcd80c2 · 2020-10-04T18:38:28.000-03:00
Co-authored-by: Cristián Maureira-Fredes &lt;cmaureir@users.noreply.github.com&gt;
diff --git a/library/frameworks.po b/library/frameworks.po
@@ -9,11 +9,7 @@ msgstr ""
 "Project-Id-Version: Python 3.8\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-06 11:59-0400\n"
-<<<<<<< HEAD
 "PO-Revision-Date: 2020-10-04 17:59-0300\n"
-=======
-"PO-Revision-Date: 2020-10-04 15:39-0300\n"
->>>>>>> 9b119daf3ec0a31ef491ed78d9f9118a9f677891
 "Language-Team: python-doc-es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
