fix: merge conflict

ajpinedam · ajpinedam · commit ee2d0b5f17a5 · 2021-06-14T15:29:51.000-04:00
diff --git a/src/Uno.UI/UI/Xaml/Controls/ScrollViewer/ScrollViewer.cs b/src/Uno.UI/UI/Xaml/Controls/ScrollViewer/ScrollViewer.cs
@@ -47,7 +47,6 @@ namespace Windows.UI.Xaml.Controls
 {
 	public partial class ScrollViewer : ContentControl, IFrameworkTemplatePoolAware
 	{
-		private bool m_isInDirectManipulation;
 		private bool m_isInConstantVelocityPan;
 
 		private static class Parts
@@ -1510,9 +1509,7 @@ internal bool BringIntoViewport(Rect bounds,
 #endif
 		}
 
-		internal bool IsInDirectManipulation => m_isInDirectManipulation;
-
-		internal bool IsInManipulation => m_isInDirectManipulation || m_isInConstantVelocityPan;
+		internal bool IsInManipulation => IsInDirectManipulation || m_isInConstantVelocityPan;
 
 		internal bool ForceChangeToCurrentView { get; set; } = false;
 

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,6 @@ namespace Windows.UI.Xaml.Controls`
`47`	`47`	`{`
`48`	`48`	`public partial class ScrollViewer : ContentControl, IFrameworkTemplatePoolAware`
`49`	`49`	`{`
`50`		`- private bool m_isInDirectManipulation;`
`51`	`50`	`private bool m_isInConstantVelocityPan;`
`52`	`51`
`53`	`52`	`private static class Parts`
`@@ -1510,9 +1509,7 @@ internal bool BringIntoViewport(Rect bounds,`
`1510`	`1509`	`#endif`
`1511`	`1510`	`}`
`1512`	`1511`
`1513`		`- internal bool IsInDirectManipulation => m_isInDirectManipulation;`
`1514`		`-`
`1515`		`- internal bool IsInManipulation => m_isInDirectManipulation \|\| m_isInConstantVelocityPan;`
	`1512`	`+ internal bool IsInManipulation => IsInDirectManipulation \|\| m_isInConstantVelocityPan;`
`1516`	`1513`
`1517`	`1514`	`internal bool ForceChangeToCurrentView { get; set; } = false;`
`1518`	`1515`