Fix merge issue

This commit is contained in:
Sebastiaan Janssen
2013-05-27 08:19:20 -02:00
parent aef44065c5
commit 7ccae64dd1

View File

@@ -1766,6 +1766,7 @@
<Compile Include="WebServices\BulkPublishController.cs" />
<Compile Include="WebServices\CoreStringsController.cs" />
<Compile Include="WebServices\DomainsApiController.cs" />
<Compile Include="WebServices\EmbedMediaService.cs" />
<Compile Include="WebServices\ExamineManagementApiController.cs" />
<Compile Include="WebServices\FolderBrowserService.cs" />
<Compile Include="WebServices\UmbracoAuthorizedHttpHandler.cs" />