Combine the two .gitignore

2021-04-25 20:20:37 -04:00
1 parent 6aea857e3e
commit 121fa7d698
@@ -1,22 +0,0 @@
-robovm-logs/
-robovm-build/
-
-## Java
-
-*.class
-*.war
-*.ear
-hs_err_pid*
-
-## Gradle
-.gradle/
-/build
-**/build
-
-## Idea
-.idea/
-*.ipr
-*.iws
-*.iml
-
-.DS_STORE
@@ -1,3 +1,25 @@
 /packages
 /Natives/libpojavexec.dylib
 /Natives/PojavLauncher 
+robovm-logs/
+robovm-build/
+
+## Java
+
+*.class
+*.war
+*.ear
+hs_err_pid*
+
+## Gradle
+.gradle/
+/build
+**/build
+
+## Idea
+.idea/
+*.ipr
+*.iws
+*.iml
+
+.DS_STORE