summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Lord-Nightmare <Lord-Nightmare@users.noreply.github.com>2014-11-19 23:46:10 -0500
committer Lord-Nightmare <Lord-Nightmare@users.noreply.github.com>2014-11-19 23:46:10 -0500
commitedf4f349f82c7aaaba7a168ab8ce53b2fcddca15 (patch)
tree37fd79063d736823535dee6d07807a3812410ce6
parent8eaacc2d860c69d53a3df35d6d8938ea2f60ceab (diff)
Fix for XML accidental copy-paste error (n/w)
-rw-r--r--hash/vsmile_cd.xml4
1 files changed, 0 insertions, 4 deletions
diff --git a/hash/vsmile_cd.xml b/hash/vsmile_cd.xml
index 4122579c9fe..735700a3519 100644
--- a/hash/vsmile_cd.xml
+++ b/hash/vsmile_cd.xml
@@ -54,11 +54,7 @@ Language:
80-093140(US) | Shrek The Third - The Search for Arthur
80-093143(UK) | Shrek The Third - The Search for Arthur
80-093144(GE) | Shrek Der Dritte - Die Suche nach Arthus
-<<<<<<< HEAD
-80-093145(FR) | Shrek Le Troisieme: L'aventure D'arthur
-=======
80-093145(FR) | Shrek Le Troisième: L'aventure D'arthur
->>>>>>> af790a7dcf8be74bb805869f2c5d9071942b38ba
80-093147(SP) | Shrek Tercero - Donde esta Arturo?
-
80-093160(US) | Bratz - The Secret Necklace