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

Fixes merge issues with left over IPublishedContentProperty

Browse Source
This commit is contained in:
Shannon
2014-05-05 13:21:18 +10:00
parent 3df2d03fc8
commit 36c7fd53cb
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Core/Dynamics/PropertyResult.cs
View File

@@ -4,14 +4,14 @@ using System.Web;
namespace Umbraco.Core.Dynamics
{
internal class PropertyResult : IPublishedContentProperty, IHtmlString
internal class PropertyResult : IPublishedProperty, IHtmlString
{
private readonly IPublishedContentProperty _source;
private readonly IPublishedProperty _source;
private readonly string _alias;
private readonly object _value;
private readonly PropertyResultType _type;
internal PropertyResult(IPublishedContentProperty source, PropertyResultType type)
internal PropertyResult(IPublishedProperty source, PropertyResultType type)
{
if (source == null) throw new ArgumentNullException("source");

2
src/Umbraco.Core/Umbraco.Core.csproj
View File

@@ -342,7 +342,7 @@
<Compile Include="Models\EntityExtensions.cs" />
<Compile Include="Models\Folder.cs" />
<Compile Include="Models\IMemberGroup.cs" />
<Compile Include="Models\IPublishedContentProperty.cs" />
<Compile Include="Models\IPublishedProperty.cs" />
<Compile Include="Models\IRelation.cs" />
<Compile Include="Models\IRelationType.cs" />
<Compile Include="Models\Membership\MembershipScenario.cs" />