Merge remote-tracking branch 'origin/device-provision-response-store' into dev

2024-02-12 18:04:58 +05:30
parent 727040fabf 80eb658b07
commit 2b2c16df22
17 changed files with 293 additions and 34 deletions
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -119,8 +119,13 @@
            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