Fixing merge issue

sloutsky · sloutsky · commit 3dbd960fc7d2 · 2020-06-06T15:03:02.000+03:00
diff --git a/ICSharpCode.AvalonEdit/Editing/TextAreaAutomationPeer.cs b/ICSharpCode.AvalonEdit/Editing/TextAreaAutomationPeer.cs
@@ -117,7 +117,7 @@ public override object GetPattern(PatternInterface patternInterface)
 				if (editor != null) {
 					var fromElement = FromElement(editor);
 					if (fromElement != null)
-						fromElement.GetPattern(patternInterface);
+						return fromElement.GetPattern(patternInterface);
 				}
 			}
 			return base.GetPattern(patternInterface);

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public override object GetPattern(PatternInterface patternInterface)`
`117`	`117`	`if (editor != null) {`
`118`	`118`	`var fromElement = FromElement(editor);`
`119`	`119`	`if (fromElement != null)`
`120`		`- fromElement.GetPattern(patternInterface);`
	`120`	`+ return fromElement.GetPattern(patternInterface);`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`	`return base.GetPattern(patternInterface);`