Config.xml angepasst, Kaufabwicklung funktioniert jetzt reibungslos

2016-02-02 16:11:18 +01:00
parent 89e8dde72c
commit 5e25c4ca61
1219 changed files with 92546 additions and 2746 deletions
--- a/platforms/android/local.properties
+++ b/platforms/android/local.properties
@@ -7,8 +7,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Thu Jan 28 20:45:10 CET 2016
->>>>>>>=3333e9eb4a430bda0cc488281fef2864949ca135
-sdk.dir=C\:\\Android
-=\=\=\=\=\=\=
-<<<<<<<=HEAD
+#Tue Feb 02 12:37:39 CET 2016
+sdk.dir=C\:\\Android\\android-sdk