신기성 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
신기성
6632e7c7 1 parent b4214980

manifest fix

Inline Side-by-side
Showing 1 changed file with 2 additions and 13 deletions
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 2 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 package="com.example.vip"> 3 package="com.example.vip">
4 -
5 - <uses-permission android:name="android.permission.INTERNET" />
6 -
7 <application 4 <application
8 android:allowBackup="true" 5 android:allowBackup="true"
9 android:icon="@mipmap/ic_launcher" 6 android:icon="@mipmap/ic_launcher"
...@@ -11,22 +8,14 @@ ...@@ -11,22 +8,14 @@
11 android:roundIcon="@mipmap/ic_launcher_round" 8 android:roundIcon="@mipmap/ic_launcher_round"
12 android:supportsRtl="true" 9 android:supportsRtl="true"
13 android:theme="@style/AppTheme"> 10 android:theme="@style/AppTheme">
14 -<<<<<<< HEAD
15 - <activity android:name=".SplashActivity" android:theme="@style/SplashTheme">
16 -=======
17 <activity android:name=".SignInActivity"></activity> 11 <activity android:name=".SignInActivity"></activity>
18 <activity android:name=".SignUpActivity" /> 12 <activity android:name=".SignUpActivity" />
19 - <activity android:name=".MainActivity"> 13 + <activity android:name=".MainActivity"/>
20 ->>>>>>> 30e9555883e1f0d8a1af31b839e6ed410407101f 14 + <activity android:name=".SplashActivity" android:theme="@style/SplashTheme">
21 <intent-filter> 15 <intent-filter>
22 <action android:name="android.intent.action.MAIN" /> 16 <action android:name="android.intent.action.MAIN" />
23 -
24 <category android:name="android.intent.category.LAUNCHER" /> 17 <category android:name="android.intent.category.LAUNCHER" />
25 </intent-filter> 18 </intent-filter>
26 </activity> 19 </activity>
27 - <activity android:name=".MainActivity">
28 -
29 - </activity>
30 </application> 20 </application>
31 -
32 </manifest> 21 </manifest>
...\ No newline at end of file ...\ No newline at end of file
......