Merge branch 'develop'

5 years ago · 658735fd60
parent cb6fa59b4b ba64007a6e
commit 658735fd60
2 changed files with 3 additions and 3 deletions
--- a/src/Notes-master.zip
+++ b/src/Notes-master.zip
--- a/src/Notes-master2/app/src/main/AndroidManifest.xml
+++ b/src/Notes-master2/app/src/main/AndroidManifest.xml
@ -44,9 +44,9 @@
            android:windowSoftInputMode="adjustPan" >

            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+            <action android:name="android.intent.action.MAIN" />
+            <category android:name="android.intent.category.LAUNCHER" />
+        </intent-filter>
        </activity>

        <activity