Skip to content

Commit a080c4f

Browse files
pkpdeveloperpkpdeveloper
committed
Merge branch 'release-1.2' into develop
2 parents 8654ccb + 59dc981 commit a080c4f

File tree

3 files changed

+29
-2
lines changed

3 files changed

+29
-2
lines changed

‎.idea/.name‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.idea/misc.xml‎

Lines changed: 28 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<category android:name="android.intent.category.LAUNCHER" />
2020
</intent-filter>
2121
</activity>
22+
<activity android:name=".NewActivity"></activity>
2223
</application>
2324

2425
</manifest>

0 commit comments

Comments
 (0)