diff --git a/locale/es/BOINC-Android.po b/locale/es/BOINC-Android.po
index 7ec5cd7bb6..4e29d3cc51 100644
--- a/locale/es/BOINC-Android.po
+++ b/locale/es/BOINC-Android.po
@@ -6,11 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
-=======
-"POT-Creation-Date: 2013-10-23 00:00-0700\n"
->>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-10-22 15:28-0700\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: es <LL@li.org>\n"