去除部分代码

ModuleProject/app_passport/src/main/module/AndroidManifest.xml

@@ -2,27 +2,4 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.app.login">
     package="com.app.login">
 
 
-
-    <application
-        android:roundIcon="@mipmap/lg_ic_launcher"
-        android:allowBackup="false"
-        android:theme="@android:style/Theme.NoTitleBar"
-        android:icon="@mipmap/lg_ic_launcher"
-        android:label="@string/lg_app_name_test"
-        tools:ignore="GoogleAppIndexingWarning"
-        tools:replace="android:icon,android:roundIcon,android:theme,android:label,android:allowBackup">
-
-<<<<<<< HEAD
-        <activity android:name="com.hikcreate,login.testLoginActivity">
-=======
-        <activity android:name="com.main.testLoginActivity">
->>>>>>> 483bb067a456c0e8a14e8c61ce522972aad9097a
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-
-    </application>
-
 </manifest>
 </manifest>
\ No newline at end of file