chore: Adjust for backport

unoplatform · Aug 30, 2024 · e80ed41 · e80ed41
1 parent 3961432
commit e80ed41
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/doc/articles/controls/WebView.md b/doc/articles/controls/WebView.md
@@ -2,11 +2,7 @@
 
 > Uno Platform supports two `WebView` controls - a legacy `WebView` and a modernized `WebView2` control. For new development, we strongly recommend `WebView2` as it will get further improvements in the future.
 
-<<<<<<< HEAD
-`WebView2` is currently supported on Windows, Android, iOS, and macOS.
-=======
 `WebView2` is currently supported on Windows, Android, iOS, macOS (Catalyst), and Skia WPF.
->>>>>>> ca34d55292 (docs: Specify macOS support for WebView2)
 
 ## Basic usage