bjquanjiang
/
DigitalScholl
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

解决冲突

临城职教中职
ndbs 2 years ago
parent
24dba0336d
commit
432ea5e362
1 changed files with 0 additions and 3 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

+ 0
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj View File

@@ -6643,10 +6643,7 @@
<Content Include="Areas\EducationalAdministration\Views\TextBookIndent\Index.js" /> <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\Index.js" />
<Content Include="Areas\EducationalAdministration\Views\TextBookIndent\Form.cshtml" /> <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\Form.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\TextBookIndent\Form.js" /> <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\Form.js" />
<Content Include="Areas\EducationalAdministration\Views\TextBookIndentDetail\Index.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\TextBookIndentDetail\Index.js" />
<Content Include="Areas\EducationalAdministration\Views\TextBookIndent\FormDetail.cshtml" /> <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\FormDetail.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\TextBookIndentDetail\Form.js" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="Areas\EducationalAdministration\Views\OpenLessonPlanOfElectivePre\" /> <Folder Include="Areas\EducationalAdministration\Views\OpenLessonPlanOfElectivePre\" />


Write Preview
Loading…
Cancel
Save