From 81cf8b4d3bc4579b90a6fc4a97e61cc3acfc8c95 Mon Sep 17 00:00:00 2001
From: Alessio Lenzi <lenzone10@rockbox.org>
Date: Wed, 9 Jan 2008 21:38:05 +0000
Subject: Oops, my previous commit was incorrect. Committed wrong file.

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

(limited to 'apps/lang/italiano.lang')

diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index fe024e29bf..4bbc971ec0 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -11467,22 +11467,6 @@
     ipodvideo: "Taglio Alti"
   </voice>
 </phrase>
-<<<<<<< .mine
-<phrase>
-  id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
-  user:
-  <source>
-    *: "<Random>"
-  </source>
-  <dest>
-    *: "<Casuale>"
-  </dest>
-  <voice>
-    *: "Casuale"
-  </voice>
-</phrase>
-=======
 <phrase>
   id: LANG_TAGNAVI_RANDOM
   desc: "<Random>" entry in tag browser
-- 
cgit v1.2.3