fix: merge conflicts

meese-enterprises · Sep 17, 2024 · aa2cd11 · aa2cd11
1 parent 5fe501b
commit aa2cd11
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="enterprises.meese.whiterose">
-    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -14,8 +13,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Whiterose"
-        tools:targetApi="31">
+        android:theme="@style/Theme.Whiterose">
         <activity
             android:name=".MainActivity"
             android:exported="true"