From 8cd726e20883cb09b76389a8a083ebd4c85aaa80 Mon Sep 17 00:00:00 2001
From: Mustapha Senhaji <moos@rockbox.org>
Date: Thu, 25 Dec 2008 11:48:28 +0000
Subject: Remove a last junk that was unintentionaly added to english file.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19590 a1c6a512-1295-4272-9138-f99709370657
---
 apps/lang/english.lang | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 5bce7f4289..851c47528d 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -12344,5 +12344,4 @@
     *: none
     quickscreen: "Set as Bottom Quickscreen Item"
   </voice>
-</phrase>
->>>>>>> .r19041
+</phrase>
\ No newline at end of file
-- 
cgit v1.2.3