From a21b3456527e688eebdfbe0f70113b6a99f1b2a2 Mon Sep 17 00:00:00 2001
From: Velaron <mars873@gmail.com>
Date: Tue, 2 Jan 2024 10:45:33 +0200
Subject: [PATCH] android: merge .gitignore

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

diff --git a/.gitignore b/.gitignore
index 42594b50..2c5017bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,13 @@ CMakeSettings.json
 CMakeFiles
 CMakeCache.txt
 Makefile
+
+# Android Studio/Gradle
+.gradle/
+.externalNativeBuild
+.cxx/
+.idea/
+local.properties
+.project
+.classpath
+.settings
\ No newline at end of file
diff --git a/android/.gitignore b/android/.gitignore
deleted file mode 100644
index 1b88d186..00000000
--- a/android/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.gradle/
-build/
-.externalNativeBuild
-.cxx/
-.idea/
-local.properties
-.project
-.classpath
-.gradle
-.settings
\ No newline at end of file