merg complete

2016-01-22 00:53:11 +01:00 · 2016-01-22 00:53:11 +01:00 · 3c5d7f9b37
commit 3c5d7f9b37
parent 81c4347cf1
193 changed files with 40 additions and 71 deletions
--- a/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock
+++ b/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock
--- a/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin
+++ b/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin
--- a/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
+++ b/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
--- a/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin
+++ b/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin
--- a/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
+++ b/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
--- a/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar
+++ b/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CallbackContext.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CallbackContext.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/ConfigXmlParser.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/ConfigXmlParser.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaActivity$1.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaActivity$1.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaActivity$2.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaActivity$2.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaActivity$3.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaActivity$3.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaActivity$4$1.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaActivity$4$1.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaActivity$4.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaActivity$4.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaActivity.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaActivity.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaArgs.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaArgs.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaBridge.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaBridge.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaDialogsHelper$1.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaDialogsHelper$1.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaDialogsHelper$2.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaDialogsHelper$2.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaDialogsHelper$3.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaDialogsHelper$3.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaDialogsHelper$4.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaDialogsHelper$4.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaDialogsHelper$5.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaDialogsHelper$5.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaDialogsHelper$6.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaDialogsHelper$6.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaDialogsHelper$7.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaDialogsHelper$7.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaDialogsHelper$8.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaDialogsHelper$8.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaDialogsHelper$9.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaDialogsHelper$9.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaDialogsHelper.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaDialogsHelper.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaInterfaceImpl.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaInterfaceImpl.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaPlugin.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaPlugin.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaResourceApi.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaResourceApi.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaWebViewImpl$1.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaWebViewImpl$1.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaWebViewImpl$2.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaWebViewImpl$2.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaWebViewImpl$3.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaWebViewImpl$3.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaWebViewImpl$EngineClient$1$1.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaWebViewImpl$EngineClient$1$1.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaWebViewImpl$EngineClient$1.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaWebViewImpl$EngineClient$1.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaWebViewImpl$EngineClient.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaWebViewImpl$EngineClient.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaWebViewImpl.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CordovaWebViewImpl.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CoreAndroid$1.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CoreAndroid$1.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CoreAndroid$2.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CoreAndroid$2.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CoreAndroid$3.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CoreAndroid$3.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CoreAndroid$4.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CoreAndroid$4.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CoreAndroid$5.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CoreAndroid$5.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CoreAndroid.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/CoreAndroid.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/LOG.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/LOG.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/NativeToJsMessageQueue$JsMessage.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/NativeToJsMessageQueue$JsMessage.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/NativeToJsMessageQueue$LoadUrlBridgeMode$1.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/NativeToJsMessageQueue$LoadUrlBridgeMode$1.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/NativeToJsMessageQueue$LoadUrlBridgeMode.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/NativeToJsMessageQueue$LoadUrlBridgeMode.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/NativeToJsMessageQueue$OnlineEventsBridgeMode$1.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/NativeToJsMessageQueue$OnlineEventsBridgeMode$1.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/NativeToJsMessageQueue$OnlineEventsBridgeMode$2.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/NativeToJsMessageQueue$OnlineEventsBridgeMode$2.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/NativeToJsMessageQueue$OnlineEventsBridgeMode.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/NativeToJsMessageQueue$OnlineEventsBridgeMode.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/NativeToJsMessageQueue.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/NativeToJsMessageQueue.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/PluginManager.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/PluginManager.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/PluginResult$Status.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/PluginResult$Status.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/PluginResult.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/PluginResult.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/Whitelist$URLPattern.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/Whitelist$URLPattern.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/Whitelist.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/Whitelist.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/engine/SystemCookieManager.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/engine/SystemCookieManager.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/engine/SystemWebChromeClient$1.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/engine/SystemWebChromeClient$1.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/engine/SystemWebChromeClient$2.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/engine/SystemWebChromeClient$2.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/engine/SystemWebChromeClient$3.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/engine/SystemWebChromeClient$3.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/engine/SystemWebChromeClient$4.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/engine/SystemWebChromeClient$4.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/engine/SystemWebChromeClient$5.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/engine/SystemWebChromeClient$5.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/engine/SystemWebChromeClient.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/engine/SystemWebChromeClient.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/engine/SystemWebViewClient.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/engine/SystemWebViewClient.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/engine/SystemWebViewEngine$1.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/engine/SystemWebViewEngine$1.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/engine/SystemWebViewEngine$2.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/engine/SystemWebViewEngine$2.class
--- a/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/engine/SystemWebViewEngine.class
+++ b/platforms/android/CordovaLib/build/intermediates/classes/debug/org/apache/cordova/engine/SystemWebViewEngine.class
--- a/platforms/android/CordovaLib/build/intermediates/incremental/mergeAssets/debug/merger.xml
+++ b/platforms/android/CordovaLib/build/intermediates/incremental/mergeAssets/debug/merger.xml
@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main"><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\assets"/></dataSet><dataSet config="debug"><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\src\debug\assets"/></dataSet></merger>
+<merger version="3"><dataSet config="main"><source path="C:\Ionic\Ionic\git2\wolle-rosen-kaufen\platforms\android\CordovaLib\assets"/></dataSet><dataSet config="debug"><source path="C:\Ionic\Ionic\git2\wolle-rosen-kaufen\platforms\android\CordovaLib\src\debug\assets"/></dataSet></merger>
--- a/platforms/android/CordovaLib/build/intermediates/incremental/packageResources/debug/merger.xml
+++ b/platforms/android/CordovaLib/build/intermediates/incremental/packageResources/debug/merger.xml
@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main"><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\res"/><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\build\generated\res\rs\debug"/><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\build\generated\res\generated\debug"/></dataSet><dataSet config="debug"><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\src\debug\res"/></dataSet><mergedItems/></merger>
+<merger version="3"><dataSet config="main"><source path="C:\Ionic\Ionic\git2\wolle-rosen-kaufen\platforms\android\CordovaLib\res"/><source path="C:\Ionic\Ionic\git2\wolle-rosen-kaufen\platforms\android\CordovaLib\build\generated\res\rs\debug"/><source path="C:\Ionic\Ionic\git2\wolle-rosen-kaufen\platforms\android\CordovaLib\build\generated\res\generated\debug"/></dataSet><dataSet config="debug"><source path="C:\Ionic\Ionic\git2\wolle-rosen-kaufen\platforms\android\CordovaLib\src\debug\res"/></dataSet><mergedItems/></merger>
--- a/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar
+++ b/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar
--- a/platforms/android/build/generated/source/aidl/debug/com/android/vending/billing/IInAppBillingService.java
+++ b/platforms/android/build/generated/source/aidl/debug/com/android/vending/billing/IInAppBillingService.java
@ -1,6 +1,6 @@
 /*
 * This file is auto-generated.  DO NOT MODIFY.
- * Original file: C:\\Projekte\\wolle-rosen-kaufen\\platforms\\android\\src\\com\\android\\vending\\billing\\IInAppBillingService.aidl
+ * Original file: C:\\Ionic\\Ionic\\git2\\wolle-rosen-kaufen\\platforms\\android\\src\\com\\android\\vending\\billing\\IInAppBillingService.aidl
 */
 package com.android.vending.billing;
 /**
--- a/platforms/android/build/intermediates/classes/debug/com/android/vending/billing/IInAppBillingService$Stub$Proxy.class
+++ b/platforms/android/build/intermediates/classes/debug/com/android/vending/billing/IInAppBillingService$Stub$Proxy.class
--- a/platforms/android/build/intermediates/classes/debug/com/android/vending/billing/IInAppBillingService$Stub.class
+++ b/platforms/android/build/intermediates/classes/debug/com/android/vending/billing/IInAppBillingService$Stub.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/inappbilling/InAppBillingPlugin$1.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/inappbilling/InAppBillingPlugin$1.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/inappbilling/InAppBillingPlugin.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/inappbilling/InAppBillingPlugin.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Action$1.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Action$1.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Action$2.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Action$2.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Action$3.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Action$3.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Action$4.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Action$4.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Action.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Action.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Base64.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Base64.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/IabHelper$1.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/IabHelper$1.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/IabHelper$2$1.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/IabHelper$2$1.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/IabHelper$2.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/IabHelper$2.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/IabHelper$3$1.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/IabHelper$3$1.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/IabHelper$3$2.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/IabHelper$3$2.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/IabHelper$3.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/IabHelper$3.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/IabHelper.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/IabHelper.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Inventory.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Inventory.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Security.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/Security.class
--- a/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/SkuDetails.class
+++ b/platforms/android/build/intermediates/classes/debug/com/smartmobilesoftware/util/SkuDetails.class
--- a/platforms/android/build/intermediates/classes/debug/io/ionic/keyboard/IonicKeyboard$1.class
+++ b/platforms/android/build/intermediates/classes/debug/io/ionic/keyboard/IonicKeyboard$1.class
--- a/platforms/android/build/intermediates/classes/debug/io/ionic/keyboard/IonicKeyboard$2.class
+++ b/platforms/android/build/intermediates/classes/debug/io/ionic/keyboard/IonicKeyboard$2.class
--- a/platforms/android/build/intermediates/classes/debug/io/ionic/keyboard/IonicKeyboard$3$1.class
+++ b/platforms/android/build/intermediates/classes/debug/io/ionic/keyboard/IonicKeyboard$3$1.class
--- a/platforms/android/build/intermediates/classes/debug/io/ionic/keyboard/IonicKeyboard$3.class
+++ b/platforms/android/build/intermediates/classes/debug/io/ionic/keyboard/IonicKeyboard$3.class
--- a/platforms/android/build/intermediates/classes/debug/io/ionic/keyboard/IonicKeyboard.class
+++ b/platforms/android/build/intermediates/classes/debug/io/ionic/keyboard/IonicKeyboard.class
--- a/platforms/android/build/intermediates/classes/debug/io/liteglue/SQLiteAndroidDatabase$QueryType.class
+++ b/platforms/android/build/intermediates/classes/debug/io/liteglue/SQLiteAndroidDatabase$QueryType.class
--- a/platforms/android/build/intermediates/classes/debug/io/liteglue/SQLiteAndroidDatabase.class
+++ b/platforms/android/build/intermediates/classes/debug/io/liteglue/SQLiteAndroidDatabase.class
--- a/platforms/android/build/intermediates/classes/debug/io/liteglue/SQLitePlugin$1.class
+++ b/platforms/android/build/intermediates/classes/debug/io/liteglue/SQLitePlugin$1.class
--- a/platforms/android/build/intermediates/classes/debug/io/liteglue/SQLitePlugin$Action.class
+++ b/platforms/android/build/intermediates/classes/debug/io/liteglue/SQLitePlugin$Action.class
--- a/platforms/android/build/intermediates/classes/debug/io/liteglue/SQLitePlugin$DBRunner.class
+++ b/platforms/android/build/intermediates/classes/debug/io/liteglue/SQLitePlugin$DBRunner.class
--- a/Show More
+++ b/Show More
`@ -1,2 +1,2 @@`
	`<?xml version="1.0" encoding="utf-8"?>`	`<?xml version="1.0" encoding="utf-8"?>`
	`<merger version="3"><dataSet config="main"><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\assets"/></dataSet><dataSet config="debug"><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\src\debug\assets"/></dataSet></merger>`	`<merger version="3"><dataSet config="main"><source path="C:\Ionic\Ionic\git2\wolle-rosen-kaufen\platforms\android\CordovaLib\assets"/></dataSet><dataSet config="debug"><source path="C:\Ionic\Ionic\git2\wolle-rosen-kaufen\platforms\android\CordovaLib\src\debug\assets"/></dataSet></merger>`