Merge branch 'master' of github.com:beworker/pinned-section-listview

sergejsha · Aug 20, 2016 · 2e1dc83 · 2e1dc83
2 parents 0d566ae + 97cae75
commit 2e1dc83
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,14 +1,13 @@
-# files
 .project
 .classpath
 .settings
-**/.DS_Store
-*.iml
+.idea/
+.gradle/
+
 local.properties
+*.iml
 
-# folders
+**/.DS_Store
 **/build/
-.idea/
-.gradle/
-gen/
-bin/
+**/gen/
+**/bin/