1 files changed, 0 insertions, 5 deletions
diff --git a/po/is.po b/po/is.po
index acf77715..505b9727 100644
--- a/po/is.po
+++ b/po/is.po
@@ -8,13 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< is.po
-"POT-Creation-Date: 2006-03-07 12:11+0100\n"
-"PO-Revision-Date: 2005-09-20 22:53+0000\n"
-=======
 "POT-Creation-Date: 2006-03-03 21:28+0100\n"
 "PO-Revision-Date: 2006-03-07 09:31+0000\n"
->>>>>>> 1.74
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team:  <is@li.org>\n"
 "MIME-Version: 1.0\n"