Fix rebase errors

xamarin · Nov 8, 2018 · 2ae139e · 2ae139e
1 parent 5cdf375
commit 2ae139e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/Xamarin.Forms.Platform.Android/FastRenderers/ButtonRenderer.cs b/Xamarin.Forms.Platform.Android/FastRenderers/ButtonRenderer.cs
@@ -457,7 +457,6 @@ void UpdateContentEdge(Thickness? delta = null)
 			_paddingDeltaPix = delta ?? new Thickness();
 			UpdatePadding();
 		}
-<<<<<<< HEAD
 
 		float IBorderVisualElementRenderer.ShadowRadius => ShadowRadius;
 		float IBorderVisualElementRenderer.ShadowDx => ShadowDx;
@@ -475,7 +474,5 @@ void UpdateContentEdge(Thickness? delta = null)
 
 			return _platformElementConfiguration;
 		}
-=======
->>>>>>> fab71ee1... Remove debugging code; remove outdated todos; remove unnecessary comments
 	}
 }
diff --git a/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj b/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj
@@ -64,7 +64,6 @@
     <Compile Include="BackgroundManager.cs" />
     <Compile Include="AppCompat\ILifeCycleState.cs" />
     <Compile Include="BorderBackgroundManager.cs" />
-    <Compile Include="ButtonBackgroundTracker.cs" />
     <Compile Include="CollectionView\CarouselViewRenderer.cs" />
     <Compile Include="CollectionView\DataChangeObserver.cs" />
     <Compile Include="CollectionView\EmptyViewAdapter.cs" />
@@ -157,10 +156,8 @@
     <Compile Include="LayoutExtensions.cs" />
     <Compile Include="PowerSaveModeBroadcastReceiver.cs" />
     <Compile Include="Renderers\AHorizontalScrollView.cs" />
-    <Compile Include="Renderers\AlignmentExtensions.cs" />
     <Compile Include="Renderers\BorderDrawable.cs" />
     <Compile Include="Renderers\ButtonRenderer.cs" />
-    <Compile Include="Renderers\ButtonDrawable.cs" />
     <Compile Include="Renderers\AlignmentExtensions.cs" />
     <Compile Include="CollectionView\CollectionViewRenderer.cs" />
     <Compile Include="Renderers\ConditionalFocusLayout.cs" />