추개개발2

BO/BO.csproj

@@ -713,13 +713,7 @@
     <Content Include="Views\user\LeaveHistory.cshtml" />
     <Content Include="Views\Shared\Partial\UserBoxSelect.cshtml" />
     <Content Include="Views\cm\cmregexset.cshtml" />
-<<<<<<< HEAD
-    <None Include="Web.Staging.config">
-      <DependentUpon>Web.config</DependentUpon>
-    </None>
-=======
     <Content Include="Web.Staging.config" />
->>>>>>> 8c571ed (추가개발2)
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />

FO/FO.csproj

@@ -758,17 +758,13 @@
     <Content Include="Views\Course\SmartSearch.cshtml" />
     <Content Include="Views\Account\FindIDPW.cshtml" />
     <Content Include="Views\Account\NewPassword.cshtml" />
-    <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
-    <None Include="Web.Develop.config">
+    <Content Include="Properties\PublishProfiles\FolderProfile.pubxml" />
+    <Content Include="Web.Develop.config">
       <DependentUpon>Web.config</DependentUpon>
-    </None>
-<<<<<<< HEAD
-    <None Include="Web.Staging.config">
+    </Content>
+    <Content Include="Web.Staging.config">
       <DependentUpon>Web.config</DependentUpon>
-    </None>
-=======
-    <None Include="Web.Staging.config" />
->>>>>>> 8c571ed (추가개발2)
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Base\Base.csproj">