Update library/frameworks.po

eflipe · cmaureir · web-flow · commit 7e599141eed9 · 2020-10-04T18:37:36.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
@@ -25,11 +25,7 @@ msgstr ""
 
 #: ../Doc/library/frameworks.rst:5
 msgid "Program Frameworks"
-<<<<<<< HEAD
 msgstr "*Frameworks* de programa"
-=======
-msgstr "*Frameworks* de Programa\v"
->>>>>>> 9b119daf3ec0a31ef491ed78d9f9118a9f677891
 
 #: ../Doc/library/frameworks.rst:7
 msgid ""
