From fff753e3aaaa46a463468a33e629a9cfa659562d Mon Sep 17 00:00:00 2001
From: mStar <me@mstar.dev>
Date: Tue, 17 Sep 2024 15:45:15 +0200
Subject: [PATCH] update gitignore

---
 .gitignore | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 27f0708..1ae9a46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,10 @@ db.sqlite
 .env
 .lapce/
 */tmp.*
-<<<<<<< HEAD
 /frontend/
+config.toml
+.air.toml
+*/**/.null_*
 
 
 # --- Section ember frontend ---
@@ -33,8 +35,4 @@ db.sqlite
 
 # broccoli-debug
 /frontend-src/DEBUG/
-=======
 
-config.toml
-.air.toml
->>>>>>> 0ec0ad42bca3a05b05256862904285bb74e314cb