From 9f04125f68c890cc9aa5bf0804098851963b8e16 Mon Sep 17 00:00:00 2001
From: Pritimay Sarkar <pritimay@sminnovations.in>
Date: Mon, 12 Feb 2024 18:07:19 +0530
Subject: [PATCH] fix conflict

---
 app/src/main/AndroidManifest.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6885e3a..9bc14ac 100644
--- 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