추가개발-web.config 수정

2025-12-26 23:27:21 +09:00 · 2025-12-26 23:27:21 +09:00 · 7054b3b51a
parent 5dbb28a949
commit 7054b3b51a
6 changed files with 3 additions and 4 deletions
--- a/BO/BO.csproj
+++ b/BO/BO.csproj
@ -711,12 +711,11 @@
    <Content Include="Views\croom\gradeall0_1.cshtml" />
    <Content Include="Views\croom\gradeupload.cshtml" />
    <Content Include="Views\user\LeaveHistory.cshtml" />
-<<<<<<< HEAD
-    <None Include="Web.Staging.config" />
-=======
    <Content Include="Views\Shared\Partial\UserBoxSelect.cshtml" />
    <Content Include="Views\cm\cmregexset.cshtml" />
->>>>>>> ca8967d (추가개발1)
+    <None Include="Web.Staging.config">
+      <DependentUpon>Web.config</DependentUpon>
+    </None>
  </ItemGroup>
  <ItemGroup>
    <Folder Include="App_Data\" />
--- a/BO/bin/NP.Base.dll
+++ b/BO/bin/NP.Base.dll
--- a/BO/bin/NP.Dao.dll
+++ b/BO/bin/NP.Dao.dll
--- a/BO/bin/NP.Model.dll
+++ b/BO/bin/NP.Model.dll
--- a/BO/obj/Debug/BO.csproj.AssemblyReference.cache
+++ b/BO/obj/Debug/BO.csproj.AssemblyReference.cache
--- a/BO/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/BO/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache