Skip to content

Commit a0d2fe2

Browse files
committed
Merge pull request #1 from yelinaung/master
Remove duplicate Activity entry from Manifest
2 parents b454ae5 + fdc1e48 commit a0d2fe2

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

app/app.iml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="TutorialViewApp" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -79,7 +79,6 @@
7979
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8080
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
8181
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8382
</content>
8483
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
8584
<orderEntry type="sourceFolder" forTests="false" />

app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
<activity android:name="com.braunster.tutorialview.TutorialActivity"
2121
android:theme="@style/TutorialActivityTheme"/>
2222

23-
<activity android:name="com.braunster.tutorialview.TutorialActivity"
24-
android:theme="@style/TutorialActivityTheme"/>
25-
2623
</application>
2724

2825
</manifest>

tutorial_view/tutorial_view.iml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="TutorialViewApp" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -80,7 +80,6 @@
8080
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8181
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
8282
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
83-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8483
</content>
8584
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
8685
<orderEntry type="sourceFolder" forTests="false" />

0 commit comments

Comments
 (0)