post merge fixes

customerio · Sep 30, 2024 · 49f7fa7 · 49f7fa7
1 parent 66cb7dd
commit 49f7fa7
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 184 deletions.
diff --git a/Apps/APN/android/app/src/debug/java/io/customer/ami/ReactNativeFlipper.java b/Apps/APN/android/app/src/debug/java/io/customer/ami/ReactNativeFlipper.java
diff --git a/Apps/APN/android/app/src/main/java/io/customer/ami/MainActivity.java b/Apps/APN/android/app/src/main/java/io/customer/ami/MainActivity.java
diff --git a/Apps/APN/android/app/src/main/java/io/customer/ami/MainActivity.kt b/Apps/APN/android/app/src/main/java/io/customer/ami/MainActivity.kt
@@ -1,8 +1,9 @@
 package io.customer.ami;
-import com.facebook.react.ReactActivity;
-import com.facebook.react.ReactActivityDelegate;
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled;
-import com.facebook.react.defaults.DefaultReactActivityDelegate;
+
+import com.facebook.react.ReactActivity
+import com.facebook.react.ReactActivityDelegate
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
+import com.facebook.react.defaults.DefaultReactActivityDelegate
 
 class MainActivity : ReactActivity() {
 

diff --git a/Apps/APN/android/app/src/main/java/io/customer/ami/MainApplication.java b/Apps/APN/android/app/src/main/java/io/customer/ami/MainApplication.java
diff --git a/Apps/APN/android/app/src/main/java/io/customer/ami/MainApplication.kt b/Apps/APN/android/app/src/main/java/io/customer/ami/MainApplication.kt
@@ -1,15 +1,16 @@
 package io.customer.ami;
-import android.app.Application;
-import com.facebook.react.PackageList;
-import com.facebook.react.ReactApplication;
-import com.facebook.react.ReactHost;
-import com.facebook.react.ReactNativeHost;
-import com.facebook.react.ReactPackage;
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load;
-import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost;
-import com.facebook.react.defaults.DefaultReactNativeHost;
-import com.facebook.react.flipper.ReactNativeFlipper;
-import com.facebook.soloader.SoLoader;
+
+import android.app.Application
+import com.facebook.react.PackageList
+import com.facebook.react.ReactApplication
+import com.facebook.react.ReactHost
+import com.facebook.react.ReactNativeHost
+import com.facebook.react.ReactPackage
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
+import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
+import com.facebook.react.defaults.DefaultReactNativeHost
+import com.facebook.react.flipper.ReactNativeFlipper
+import com.facebook.soloader.SoLoader
 
 class MainApplication : Application(), ReactApplication {