Updated Serbian translation

diff --git a/po/sr.po b/po/sr.po
index fea7c38..28ff36c 100644 (file)
--- a/po/sr.po
+++ b/po/sr.po
@@ -11,16 +11,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.8\n"
-<<<<<<< HEAD
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-09-22 12:51-0400\n"
 "PO-Revision-Date: 2007-09-06 21:11+0100\n"
-=======
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&component=general\n"
 "POT-Creation-Date: 2009-09-05 01:22+0000\n"
 "PO-Revision-Date: 2009-09-30 02:59+0000\n"
->>>>>>> Updated Serbian translation
 "Last-Translator: Милош Поповић <gpopac@gmail.com>\n"
 "Language-Team: Serbian <gnome@prevod.org>\n"
 "MIME-Version: 1.0\n"

diff --git a/po/sr@latin.po b/po/sr@latin.po
index b645a87..5cd2361 100644 (file)
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -11,16 +11,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.8\n"
-<<<<<<< HEAD
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-09-22 12:51-0400\n"
 "PO-Revision-Date: 2007-09-06 21:11+0100\n"
-=======
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&component=general\n"
 "POT-Creation-Date: 2009-09-05 01:22+0000\n"
 "PO-Revision-Date: 2009-09-30 02:59+0000\n"
->>>>>>> Updated Serbian translation
 "Last-Translator: Miloš Popović <gpopac@gmail.com>\n"
 "Language-Team: Serbian <gnome@prevod.org>\n"
 "MIME-Version: 1.0\n"