From a7ed08285208a0b99f43c8dd9399e334d00e480f Mon Sep 17 00:00:00 2001
From: KimHanJin <grips76@kakao.com>
Date: Wed, 7 Jan 2026 10:08:05 +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

---
 BO/Properties/PublishProfiles/FolderProfile.pubxml | 14 --------------
 FO/Properties/PublishProfiles/FolderProfile.pubxml | 14 --------------
 2 files changed, 28 deletions(-)

diff --git a/BO/Properties/PublishProfiles/FolderProfile.pubxml b/BO/Properties/PublishProfiles/FolderProfile.pubxml
index 6389391..e67b6d9 100644
--- a/BO/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/BO/Properties/PublishProfiles/FolderProfile.pubxml
@@ -3,19 +3,6 @@
 https://go.microsoft.com/fwlink/?LinkID=208121. 
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-<<<<<<< HEAD
-	<PropertyGroup>
-		<!-- 배포 방식 지정 -->
-		<WebPublishMethod>FileSystem</WebPublishMethod>
-		<PublishProvider>FileSystem</PublishProvider>
-		<PublishUrl>C:\ProgramData\Jenkins\.jenkins\workspace\YNICTE_BO_Staging\publish\BO</PublishUrl>
-		<DeployOnBuild>true</DeployOnBuild>
-		<Configuration>Release</Configuration>
-
-		<!-- 특정 파일/폴더 제외 -->
-		<ExcludeFilesFromDeployment>Controllers\*.cs;Models\*.cs;App_Data\*</ExcludeFilesFromDeployment>
-	</PropertyGroup>
-=======
   <PropertyGroup>
     <!-- 배포 방식 지정 -->
     <WebPublishMethod>FileSystem</WebPublishMethod>
@@ -32,5 +19,4 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <ExcludeApp_Data>False</ExcludeApp_Data>
     <DeleteExistingFiles>True</DeleteExistingFiles>
   </PropertyGroup>
->>>>>>> a30ad53 (추가개발0107_1)
 </Project>
\ No newline at end of file
diff --git a/FO/Properties/PublishProfiles/FolderProfile.pubxml b/FO/Properties/PublishProfiles/FolderProfile.pubxml
index fbcb405..f8926ac 100644
--- a/FO/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/FO/Properties/PublishProfiles/FolderProfile.pubxml
@@ -3,19 +3,6 @@
 https://go.microsoft.com/fwlink/?LinkID=208121. 
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-<<<<<<< HEAD
-	<PropertyGroup>
-		<!-- 배포 방식 지정 -->
-		<WebPublishMethod>FileSystem</WebPublishMethod>
-		<PublishProvider>FileSystem</PublishProvider>
-		<PublishUrl>C:\ProgramData\Jenkins\.jenkins\workspace\YNICTE_FO_Staging\publish\FO</PublishUrl>
-		<DeployOnBuild>true</DeployOnBuild>
-		<Configuration>Staging</Configuration>
-
-		<!-- 특정 파일/폴더 제외 -->
-		<ExcludeFilesFromDeployment>Controllers\*.cs;Models\*.cs;App_Data\*</ExcludeFilesFromDeployment>
-	</PropertyGroup>
-=======
   <PropertyGroup>
     <!-- 배포 방식 지정 -->
     <WebPublishMethod>FileSystem</WebPublishMethod>
@@ -32,5 +19,4 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <ExcludeApp_Data>False</ExcludeApp_Data>
     <DeleteExistingFiles>True</DeleteExistingFiles>
   </PropertyGroup>
->>>>>>> a30ad53 (추가개발0107_1)
 </Project>
\ No newline at end of file