From fd2fe7ae6fc1b5dab9b19362525ea01bac7c3aff Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Tue, 7 Mar 2006 11:20:43 +0000
Subject: fix broken is.po resurected from r1.77

---
 po/is.po | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'po/is.po')

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"
-- 
cgit v1.2.1