summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/lang/italiano.lang16
1 files changed, 0 insertions, 16 deletions
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index fe024e2..4bbc971 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