smiuser/hpos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Pritimay Sarkar
2024-02-12 18:07:19 +05:30
parent 2b2c16df22
commit 9f04125f68
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/AndroidManifest.xml
View File

@@ -119,13 +119,8 @@
android:noHistory="true" android:noHistory="true"
android:theme="@style/AppTheme.NoActionBar"> android:theme="@style/AppTheme.NoActionBar">
<intent-filter> <intent-filter>
<<<<<<< HEAD
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/> <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> </intent-filter>
</activity> </activity>
<activity <activity