From 7bea6b548ed5aa21d75cf20a6b86bc2e26a7a0a0 Mon Sep 17 00:00:00 2001
From: ari melody <ari@arimelody.me>
Date: Tue, 21 Jan 2025 13:27:56 +0000
Subject: [PATCH] fix .gitignore

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 025d915..cccde2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,3 @@ uploads/
 docker-compose*.yml
 !docker-compose.example.yml
 config*.toml
->>>>>>> dev