[transmageddon] Commit fix for merge errors

[Christian Fredrik Kalager Schaller <uraeus src gnome org>]

commit 2e7f5788f5986f6aebf60b6468cb85651e3d9638
Author: Christian Fredrik Kalager Schaller <uraeus linuxrising org>
Date:   Tue Jun 25 11:51:41 2013 +0200

    Commit fix for merge errors

 src/dvdtrackchooser.py |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/src/dvdtrackchooser.py b/src/dvdtrackchooser.py
index fdb4d46..3490767 100644
--- a/src/dvdtrackchooser.py
+++ b/src/dvdtrackchooser.py
@@ -53,11 +53,8 @@ class dvdtrackchooser(Gtk.Dialog):
            languages.append(language)
            
            # create a string to push into the listview
-<<<<<<< HEAD
            self.listoftracks.append(_("Title:") + " " + str(scounter) + ", " + _("Languages:") + " " + 
languages[scounter] + " " + _("Length:") + " " + str(round((self.Tracks[scounter]['length']/60), 2)) + " " + 
_("Minutes"))
-=======
            self.listoftracks.append(_("Title: ") + str(scounter) + ", " + _("Languages: ") + 
languages[scounter] + _(" Length: ") + str(round((self.Tracks[scounter]['length']/60), 2)) + " Minutes")
->>>>>>> fix typo in string
 
            # For testing purposes look for longest track
            scounter=scounter+1