Resuelvo conflicto

diff --cc po/es/mwcc.po
index 88fe6f06649d7e6da1142902660f799d43f2fb36,2ebcbe61ee45cbc3fc42b1a000b040a4c1b70025..e62c4b4c48cb394d191b9dd4790d340791b8be2e
--- 1/po/es/mwcc.po
--- 2/po/es/mwcc.po
+++ b/po/es/mwcc.po
@@@ -6,11 -6,11 +6,11 @@@
  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"
+ "Language-Team: Spanish <https://hosted.weblate.org/projects/madewithcc/"
+ "translation/es/>\n"
  "Language: es\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
@@@ -10796,16 -10792,12 +10792,11 @@@ msgstr "
  
  #. type: Plain text
  #: MadewithCreativeCommonsmostup-to-dateversion.md:4495
- msgid "jonathanmann.net and"
- msgstr "jonathanmann.net y"
- 
- #. type: Plain text
- #: MadewithCreativeCommonsmostup-to-dateversion.md:4497
- msgid "jonathanmann.bandcamp.com"
- msgstr "jonathanmann.bandcamp.com"
 -#, 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:4501
+ #: MadewithCreativeCommonsmostup-to-dateversion.md:4499
  msgid ""
  "Revenue model: charging for custom services, pay-what-you-want, crowdfunding "
  "(subscription-based), charging for in-person version (speaking engagements "