yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge problem

Browse Source
This commit is contained in:
sebastiaan
2012-09-11 05:29:36 -02:00
parent 8a5cd21603
commit a864fc1fe8
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -273,9 +273,6 @@
<None Include="config\FileSystemProviders.Release.config">
<DependentUpon>FileSystemProviders.config</DependentUpon>
</None>
<Content Include="config\EmbeddedMedia.config" />
<SubType>Designer</SubType>
</Content>
<None Include="config\EmbeddedMedia.Release.config">
<DependentUpon>EmbeddedMedia.config</DependentUpon>
</None>
@@ -1905,6 +1902,7 @@
<Content Include="config\UrlRewriting.config" />
<Content Include="config\log4net.config" />
<Content Include="config\FileSystemProviders.config" />
<Content Include="config\EmbeddedMedia.config" />
<Content Include="web.config">
<SubType>Designer</SubType>
</Content>