추가개발-web.config 수정
This commit is contained in:
parent
5dbb28a949
commit
7054b3b51a
|
|
@ -711,12 +711,11 @@
|
||||||
<Content Include="Views\croom\gradeall0_1.cshtml" />
|
<Content Include="Views\croom\gradeall0_1.cshtml" />
|
||||||
<Content Include="Views\croom\gradeupload.cshtml" />
|
<Content Include="Views\croom\gradeupload.cshtml" />
|
||||||
<Content Include="Views\user\LeaveHistory.cshtml" />
|
<Content Include="Views\user\LeaveHistory.cshtml" />
|
||||||
<<<<<<< HEAD
|
|
||||||
<None Include="Web.Staging.config" />
|
|
||||||
=======
|
|
||||||
<Content Include="Views\Shared\Partial\UserBoxSelect.cshtml" />
|
<Content Include="Views\Shared\Partial\UserBoxSelect.cshtml" />
|
||||||
<Content Include="Views\cm\cmregexset.cshtml" />
|
<Content Include="Views\cm\cmregexset.cshtml" />
|
||||||
>>>>>>> ca8967d (추가개발1)
|
<None Include="Web.Staging.config">
|
||||||
|
<DependentUpon>Web.config</DependentUpon>
|
||||||
|
</None>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Folder Include="App_Data\" />
|
<Folder Include="App_Data\" />
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue