From 38564525ae5eafd180fda5ebc400d5db01df5515 Mon Sep 17 00:00:00 2001
From: Christian Wieninger <cwieninger (at) gmx (dot) de>
Date: Thu, 9 Apr 2009 20:05:08 +0200
Subject: translation fixes

---
 po/sl_SI.po | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'po/sl_SI.po')

diff --git a/po/sl_SI.po b/po/sl_SI.po
index f1f38f6..0a117c5 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,11 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-<<<<<<< HEAD:po/sl_SI.po
 "POT-Creation-Date: 2009-04-09 19:51+0200\n"
-=======
-"POT-Creation-Date: 2009-04-06 23:03+0200\n"
->>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/sl_SI.po
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
-- 
cgit v1.2.3