From 982e2d5db090305b3f57fc46e226da26839061fa Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 21 Apr 2022 16:15:36 +0200
Subject: [PATCH] Fix merge error due to changed API.

And moved fields to live with other field.
---
 src/Avalonia.Controls/Border.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Controls/Border.cs b/src/Avalonia.Controls/Border.cs
index 53de95ac41..06368eb5c6 100644
--- a/src/Avalonia.Controls/Border.cs
+++ b/src/Avalonia.Controls/Border.cs
@@ -71,6 +71,8 @@ namespace Avalonia.Controls
             AvaloniaProperty.Register<Border, PenLineJoin>(nameof(BorderLineJoin), PenLineJoin.Miter);
 
         private readonly BorderRenderHelper _borderRenderHelper = new BorderRenderHelper();
+        private Thickness? _layoutThickness;
+        private double _scale;
 
         /// <summary>
         /// Initializes static members of the <see cref="Border"/> class.
@@ -90,7 +92,7 @@ namespace Avalonia.Controls
             AffectsMeasure<Border>(BorderThicknessProperty);
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
             switch (change.Property.Name)
@@ -183,9 +185,6 @@ namespace Avalonia.Controls
             set => SetValue(BoxShadowProperty, value);
         }
 
-        private Thickness? _layoutThickness;
-        private double _scale;
-
         private Thickness LayoutThickness
         {
             get