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 (무시파일 수정)