From 138785cba0e43eac6c143042f1baccf1873e14e7 Mon Sep 17 00:00:00 2001
From: KimHanJin <grips76@kakao.com>
Date: Wed, 7 Jan 2026 10:11:28 +0900
Subject: [PATCH] =?UTF-8?q?=EC=B6=94=EA=B0=80=EA=B0=9C=EB=B0=9C0107=5F1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FO/FO.csproj.user | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/FO/FO.csproj.user b/FO/FO.csproj.user
index 7529c15..3334b14 100644
--- a/FO/FO.csproj.user
+++ b/FO/FO.csproj.user
@@ -10,11 +10,7 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-<<<<<<< HEAD
-    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
-=======
     <NameOfLastUsedPublishProfile>D:\Project\git\git_YNICTE\FO\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
->>>>>>> a30ad53 (추가개발0107_1)
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>