추가개발0107_1

2026-01-07 10:11:28 +09:00 · 2026-01-07 10:11:28 +09:00 · 138785cba0
parent a7ed082852
commit 138785cba0
1 changed files with 0 additions and 4 deletions
--- 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>