From 121fa7d69896f6905f5efc22b3d2c0315c389ca9 Mon Sep 17 00:00:00 2001
From: Adam Tunnic <atunnic@outlook.com>
Date: Sun, 25 Apr 2021 20:20:37 -0400
Subject: [PATCH] Combine the two .gitignore

---
  .gitignore | 22 ----------------------
 .gitignore  | 22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 22 deletions(-)
 delete mode 100644  .gitignore

diff --git a/ .gitignore b/ .gitignore
deleted file mode 100644
index 9dec6f85..00000000
--- a/ .gitignore	
+++ /dev/null
@@ -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
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 03800f00..7cbe0770 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
\ No newline at end of file