Edit .gitignore

Protino · Jul 22, 2016 · 9cfd91b · 9cfd91b
1 parent efb6049
commit 9cfd91b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,11 @@
 *.iml
 .gradle
+/.idea
 /local.properties
 /.idea/workspace.xml
 /.idea/misc.xml
 /.idea/libraries
+/gradle.properties
 .DS_Store
 /build
 /captures
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/dictionaries/Gurupad.xml b/.idea/dictionaries/Gurupad.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -31,11 +31,11 @@
         </activity>
         <activity
             android:name=".Activity.SettingsActivity"
-            android:parentActivityName=".Activity.MainActivity"
-            android:label="@string/title_activity_settings">
+            android:label="@string/title_activity_settings"
+            android:parentActivityName=".Activity.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".Activity.MainActivity"/>
+                android:value=".Activity.MainActivity" />
         </activity>
     </application>
 

diff --git a/gradle.properties b/gradle.properties