1 files changed, 0 insertions, 16 deletions
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

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 @@
11467	ipodvideo: "Taglio Alti"	11467	ipodvideo: "Taglio Alti"
11468	</voice>	11468	</voice>
11469	</phrase>	11469	</phrase>
11470	<<<<<<< .mine
11471	<phrase>
11472	id: LANG_TAGNAVI_RANDOM
11473	desc: "<Random>" entry in tag browser
11474	user:
11475	<source>
11476	*: "<Random>"
11477	</source>
11478	<dest>
11479	*: "<Casuale>"
11480	</dest>
11481	<voice>
11482	*: "Casuale"
11483	</voice>
11484	</phrase>
11485	=======
11486	<phrase>	11470	<phrase>
11487	id: LANG_TAGNAVI_RANDOM	11471	id: LANG_TAGNAVI_RANDOM
11488	desc: "<Random>" entry in tag browser	11472	desc: "<Random>" entry in tag browser