fix conflict

2024-02-12 18:07:19 +05:30
parent 2b2c16df22
commit 9f04125f68
1 changed files with 0 additions and 5 deletions
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -119,13 +119,8 @@
            android:noHistory="true"
            android:theme="@style/AppTheme.NoActionBar">
            <intent-filter>
-<<<<<<< HEAD
                <action android:name="android.intent.action.MAIN"/>
                <category android:name="android.intent.category.LAUNCHER"/>
-=======
-                    <action android:name="android.intent.action.MAIN" />
-                    <category android:name="android.intent.category.LAUNCHER" />
->>>>>>> origin/device-provision-response-store
            </intent-filter>
        </activity>
        <activity