feat: fix conflict

a86c13d1 · Amnon · 838d9a04 · a86c13d1
隐藏空白更改
内联并排

Showing with 0 addition and 5 deletion

quick/template/frameworks/runtime-src/proj.android/app/src/main/AndroidManifest.xml ...runtime-src/proj.android/app/src/main/AndroidManifest.xml +0 -5

未找到文件。
--- a/quick/template/frameworks/runtime-src/proj.android/app/src/main/AndroidManifest.xml
+++ b/quick/template/frameworks/runtime-src/proj.android/app/src/main/AndroidManifest.xml
@@ -9,13 +9,8 @@

    <application android:label="@string/app_name"
                 android:usesCleartextTraffic="true"
-<<<<<<< HEAD
                 android:icon="@drawable/icon">

-=======
-                 android:icon="@drawable/icon">			  
-      
->>>>>>> 7472ba2329e868ec3f9a68678a0798391b773571
 		<activity android:name="org.cocos2dx.lua.AppActivity"
 			android:label="@string/app_name"
 			android:screenOrientation="__SCREEN_ORIENTATION_ANDROID__"