From 012bafb44a9f9f502e747f434fc516dc29fc417b Mon Sep 17 00:00:00 2001
From: Pinapelz <yukais@pinapelz.com>
Date: Tue, 8 Oct 2024 23:48:49 -0700
Subject: remove .idea folder - merge IDE gitignore into main gitignore

---
 .gitignore       | 5 ++++-
 .idea/.gitignore | 3 ---
 2 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 .idea/.gitignore

diff --git a/.gitignore b/.gitignore
index bf4bd56..72e6461 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,7 @@ target/
 songs.txt
 build/
 .idea/libraries/
-META-INF
\ No newline at end of file
+META-INF
+/shelf/
+/workspace.xml
+lastFile.txt
\ No newline at end of file
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 26d3352..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-- 
cgit v1.2.3