[tali/wip/mallard-help-merge: 2/60] Updated Slovenian translation

[Ekaterina Gerasimova <egerasimov src gnome org>]

commit a3796553d70e040d7f3c5ed7d94a23ef35a28287
Author: Matej Urbančič <mateju svn gnome org>
Date:   Sat Apr 12 19:53:23 2014 +0200

    Updated Slovenian translation

 po/sl.po |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index aa2c54b..6e60def 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -13,11 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=tali&keywords=I18N+L10N&component=general\n"
 "POT-Creation-Date: 2014-04-12 11:16+0000\n"
-<<<<<<< HEAD
 "PO-Revision-Date: 2014-04-12 19:42+0100\n"
-=======
-"PO-Revision-Date: 2014-04-12 19:38+0100\n"
->>>>>>> Updated Slovenian translation
 "Last-Translator: Matej Urbančič <mateju svn gnome org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
 "Language: sl_SI\n"