From da41c0ef0c4cd3b5d647344071542c6e9c92ebb9 Mon Sep 17 00:00:00 2001
From: Michael Giacomelli <giac2000@hotmail.com>
Date: Thu, 25 Dec 2008 03:32:29 +0000
Subject: Fix junk added to language file.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19587 a1c6a512-1295-4272-9138-f99709370657
---
 apps/lang/english.lang | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index f5f9ed3..5bce7f4 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -11811,7 +11811,6 @@
     gigabeatf: "High"
   </voice>
 </phrase>
-<<<<<<< .mine
 <phrase>
   id: LANG_SERIAL_BITRATE
   desc: in system settings menu
@@ -11914,7 +11913,6 @@
     serial_port: "57600"
   </voice>
 </phrase>
-=======
 <phrase>
   id: LANG_VERY_SLOW
   desc: in settings_menu
@@ -12013,9 +12011,6 @@
     *: "slash"
   </voice>
 </phrase>
-<<<<<<< .mine
->>>>>>> .r18116
-=======
 <phrase>
   id: LANG_GAIN_LEFT
   desc: in the recording screen
@@ -12217,9 +12212,6 @@
     *: "Search Results"
   </voice>
 </phrase>
-<<<<<<< .mine
->>>>>>> .r18870
-=======
 <phrase>
   id: LANG_QS_ITEMS
   desc: DEPRECATED
-- 
cgit v1.1