merg complete

platforms/android/build/intermediates/res/debug/values/values.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- From: file:/C:/Projekte/wolle-rosen-kaufen/platforms/android/res/values/strings.xml -->
+    <!-- From: file:/C:/Ionic/Ionic/git2/wolle-rosen-kaufen/platforms/android/res/values/strings.xml -->
     <eat-comment/>
     <string name="activity_name">@string/launcher_name</string>
     <string name="app_name">Wolle Rosen kaufen</string>
-    <!-- From: file:/C:/Projekte/wolle-rosen-kaufen/platforms/android/res/values/billing_key_param.xml -->
+    <!-- From: file:/C:/Ionic/Ionic/git2/wolle-rosen-kaufen/platforms/android/res/values/billing_key_param.xml -->
     <eat-comment/>
     <string name="billing_key_param">MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnmmtV3BOmcyoYAGFakzJWpM07n3F2SmaQnjyaZsENaAq6vb7ziam6bS5LqZgMTaXSO2T4QeYoi3UZEIwuQiQ0N6BYCUca3tCa/aT1pbvVOD67cIpM+Z14UFYBnOo1RVvf4KKGZ8zJ6qUm5vsDuIboZ7P4dyXzpxRBSO3R1jDWhVCT8dyAdfQwf1Dp6mPg0sv5Q6UjAO3Jg4sMjOZID6WcAHQFxB1lDgVGmf70WZwWuGh7gQy2SvnuFcDAxT73hGjSH1j1xZB0Wr0T/vvoGpcBwj+Tjt3BbqwY2R3VbbImsuBCrkbFTIojQ8hyqxSrhftCfLyn4h/2mauo8IRVi+RrwIDAQAB</string>
-    <!-- From: file:/C:/Projekte/wolle-rosen-kaufen/platforms/android/res/values/strings.xml -->
+    <!-- From: file:/C:/Ionic/Ionic/git2/wolle-rosen-kaufen/platforms/android/res/values/strings.xml -->
     <eat-comment/>
     <string name="launcher_name">@string/app_name</string>
 </resources>

platforms/android/build/intermediates/res/debug/xml/config.xml

@@ -75,4 +75,4 @@
     <preference name="SplashScreen" value="screen" />
     <preference name="SplashScreenDelay" value="3000" />
 </widget>
-<!-- From: file:/C:/Projekte/wolle-rosen-kaufen/platforms/android/res/xml/config.xml -->
+<!-- From: file:/C:/Ionic/Ionic/git2/wolle-rosen-kaufen/platforms/android/res/xml/config.xml -->