Fix ankidroid conflict

diff --cc metadata/com.googlecode.droidwall.txt
Simple merge

diff --cc metadata/com.ichi2.anki.txt
index b491336108c3c6c33b56d4c6ebcf753f2b10238d,17ebc07afdc2053fd302bd3e74b6a5bee0d39a65..f17d76fc379ca7cffaa361e22bc334200fb6a66a
--- 1/metadata/com.ichi2.anki.txt
--- 2/metadata/com.ichi2.anki.txt
+++ b/metadata/com.ichi2.anki.txt
@@@ -1,7 -1,6 +1,6 @@@
--Use Built:Yes
 -License:GPLv3
 -Web Site:https://code.google.com/p/ankidroid/wiki/Index
 +Category:Games
 +License:GPLv3+
 +Web Site:http://ichi2.net/anki/wiki/AnkiDroid
  Source Code:http://github.com/nicolas-raoul/Anki-Android/
  Issue Tracker:http://code.google.com/p/ankidroid/issues
  Summary:A flashcard-based study aid

diff --cc metadata/org.yaxim.androidclient.txt
Simple merge