Fix merge conflict

8 years ago · 9aa93ee6d9
1 changed files with 0 additions and 4 deletions
--- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
@ -26,10 +26,6 @@
    <NoWarn>CS1591</NoWarn>
  </PropertyGroup>
    <ItemGroup>
-        <Compile Include="AvaloniaXamlLoaderPortableXaml.cs" />
-        <Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
-            <Link>Properties\SharedAssemblyInfo.cs</Link>
-        </Compile>
        <Compile Include="AvaloniaXamlLoader.cs" />
        <Compile Include="Converters\CornerRadiusTypeConverter.cs" />
        <Compile Include="Converters\MatrixTypeConverter.cs" />