추가개발12/02_4

2026-01-02 15:30:35 +09:00 · 2026-01-02 15:30:35 +09:00 · 3fecc5c09c
parent b7cb582ea6
commit 3fecc5c09c
2 changed files with 0 additions and 4 deletions
--- a/FO/FO.csproj
+++ b/FO/FO.csproj
@ -762,11 +762,7 @@
    <Content Include="Web.Develop.config">
      <DependentUpon>Web.config</DependentUpon>
    </Content>
-<<<<<<< HEAD
-    <None Include="Web.Staging.config">
-=======
    <Content Include="Web.Staging.config">
->>>>>>> 83caf9f (추가개발12/02_4)
      <DependentUpon>Web.config</DependentUpon>
    </Content>
  </ItemGroup>
--- a/UpgradeLog2.htm
+++ b/UpgradeLog2.htm