Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Resolve conflict in project file

Browse Source
This commit is contained in:
Charles Nurse
2021-04-14 15:53:07 -07:00
parent 0222bbdeae
commit f8b607911d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Oqtane.Server/Oqtane.Server.csproj
View File

@ -20,9 +20,9 @@
<Compile Remove="wwwroot\Modules\Templates\**" /> <Compile Remove="wwwroot\Modules\Templates\**" />
<Content Remove="wwwroot\Modules\Templates\**" /> <Content Remove="wwwroot\Modules\Templates\**" />
<EmbeddedResource Remove="wwwroot\Modules\Templates\**" /> <EmbeddedResource Remove="wwwroot\Modules\Templates\**" />
<Compile Remove="bin\**" /> <Compile Remove="wwwroot\Themes\Templates\**" />
<EmbeddedResource Remove="bin\**" /> <Content Remove="wwwroot\Themes\Templates\**" />
<Content Remove="bin\**" /> <EmbeddedResource Remove="wwwroot\Themes\Templates\**" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="Scripts\Master.00.00.00.00.sql" /> <EmbeddedResource Include="Scripts\Master.00.00.00.00.sql" />