From 05fb45dd98f6643ac1b49aaf5bf697081db3a01b Mon Sep 17 00:00:00 2001
From: KimHanJin <grips76@kakao.com>
Date: Mon, 29 Dec 2025 14:26:35 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AC=B4=EC=8B=9C=ED=8C=8C=EC=9D=BC=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.gitignore b/.gitignore
index 8a36c13..333b7de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -113,8 +113,15 @@ _pkginfo.txt
 *.swp
 *.swo
 <<<<<<< HEAD
+<<<<<<< HEAD
 *.cache
 *.csproj.AssemblyReference.cache
 =======
 /BO/Logs
 >>>>>>> ca8967d (추가개발1)
+=======
+/BO/Logs/
+/FO/Logs/
+/BO/obj/
+/FO/obj/
+>>>>>>> 74dfc5b (무시파일 수정)