Fix merge errors.

src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj

@@ -81,7 +81,6 @@
     <Compile Include="Media\DrawingContextImpl.cs" />
     <Compile Include="Media\GeometryImpl.cs" />
     <Compile Include="Media\Imaging\RenderTargetBitmapImpl.cs" />
-    <Compile Include="Media\ImageBrushImpl.cs" />
     <Compile Include="Media\Imaging\BitmapImpl.cs" />
     <Compile Include="Media\Imaging\D2DBitmapImpl.cs" />
     <Compile Include="Media\Imaging\WicBitmapImpl.cs" />

tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj

@@ -30,21 +30,6 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ImmediateDispatcher.cs" />
-    <Compile Include="InvariantCultureFixture.cs" />
-    <Compile Include="MockRendererFactory.cs" />
-    <Compile Include="MockPlatformRenderInterface.cs" />
-    <Compile Include="MockStreamGeometryImpl.cs" />
-    <Compile Include="NotifyingBase.cs" />
-    <Compile Include="TestLogSink.cs" />
-    <Compile Include="TestTemplatedRoot.cs" />
-    <Compile Include="TestRoot.cs" />
-    <Compile Include="TestServices.cs" />
-    <Compile Include="UnitTestApplication.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="MockWindowingPlatform.cs" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Condition="'$(TargetFramework)' == 'net461'" Include="..\..\src\Avalonia.DotNetFrameworkRuntime\Avalonia.DotNetFrameworkRuntime.csproj" />
 	<ProjectReference Condition="'$(TargetFramework)' == 'netcoreapp1.1'" Include="..\..\src\Avalonia.DotNetCoreRuntime\Avalonia.DotNetCoreRuntime.csproj" />