From f8becfe92c725bab8d80f1b225ab36016052a1e8 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Tue, 3 Mar 2015 15:47:48 +0000 Subject: [PATCH] Shattered Pixel Dungeon: fix merge error --- metadata/com.shatteredpixel.shatteredpixeldungeon.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/metadata/com.shatteredpixel.shatteredpixeldungeon.txt b/metadata/com.shatteredpixel.shatteredpixeldungeon.txt index 055787ed81..f932c0272f 100644 --- a/metadata/com.shatteredpixel.shatteredpixeldungeon.txt +++ b/metadata/com.shatteredpixel.shatteredpixeldungeon.txt @@ -64,13 +64,6 @@ Build:0.2.3f,32 echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties target=android-19 -Build:0.2.4b,35 - commit=22d072f3e7e0e36b9a3bd2a6794cef74c6d83572 - srclibs=PDClasses-shattered@35fad7951ad9cd223921a79512098013697b9d76 - prebuild=cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/ && \ - echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties - target=android-19 - Build:0.2.4b,35 commit=22d072f3e7e srclibs=PDClasses-shattered@35fad7951a