Resuelvo conflicto

diff --git a/po/es/mwcc.po b/po/es/mwcc.po
index 2ebcbe61ee45cbc3fc42b1a000b040a4c1b70025..e62c4b4c48cb394d191b9dd4790d340791b8be2e 100644 (file)
--- a/po/es/mwcc.po
+++ b/po/es/mwcc.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Made with Creative Commons\n"
-"POT-Creation-Date: 2017-10-24 12:24-0500\n"
-"PO-Revision-Date: 2017-10-24 17:20+0000\n"
+"POT-Creation-Date: 2017-10-13 12:28-0500\n"
+"PO-Revision-Date: 2017-10-24 17:26+0000\n"
 "Last-Translator: Gunnar Wolf <gwolf@gwolf.org>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/madewithcc/"
 "translation/es/>\n"
@@ -10792,9 +10792,8 @@ msgstr ""
 
 #. type: Plain text
 #: MadewithCreativeCommonsmostup-to-dateversion.md:4495
-#, fuzzy
 msgid "jonathanmann.net and jonathanmann.bandcamp.com"
-msgstr "jonathanmann.bandcamp.com"
+msgstr "jonathanmann.net y jonathanmann.bandcamp.com"
 
 #. type: Plain text
 #: MadewithCreativeCommonsmostup-to-dateversion.md:4499