fix(#308): Add prominent disclosure on startup requesting user to lin…

…k app and domain
medic · Apr 3, 2024 · f288f2a · f288f2a
1 parent f7fab0a
commit f288f2a
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
@@ -60,14 +60,11 @@
         android:screenOrientation="portrait"
        tools:ignore="DiscouragedApi"/>
     <activity android:name="RequestSendSmsPermissionActivity"
-<<<<<<< HEAD
-        android:screenOrientation="portrait"/>
-    <activity android:name="DomainVerificationActivity"
-      android:screenOrientation="portrait"/>
-=======
         android:screenOrientation="portrait"
        tools:ignore="DiscouragedApi"/>
->>>>>>> 544d0d2 (feat(#332): support Android 14 (#349))
+    <activity android:name="DomainVerificationActivity"
+        android:screenOrientation="portrait"
+      tools:ignore="DiscouragedApi"/>
     <activity android:name="AppUrlIntentActivity"
         android:launchMode="singleInstance"
         android:exported="true">