From cd52b617a129a1e275cb0e1d3dd0449ef86b35da Mon Sep 17 00:00:00 2001
From: mjeongriver <mjeongriver@gmail.com>
Date: Sun, 2 Mar 2025 21:09:32 +0900
Subject: [PATCH] =?UTF-8?q?Chore:=20gitignore=20=EC=88=98=EC=A0=95=20#8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/.gitignore b/.gitignore
index 36030e6..70374c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,5 +52,4 @@ log/
 .DS_Store
 ._.DS_Store
 **/.DS_Store
-<<<<<<< HEAD
 **/._.DS_Store
\ No newline at end of file