Fix PEBKAC merge error

lib/ui/window.dart

@@ -267,14 +267,14 @@ abstract class FlutterView {
   @FfiNative<Void Function(Pointer<Void>)>('PlatformConfigurationNativeApi::Render')
   external static void _render(Scene scene);
 
-  /// Change the retained semantics data about this platform dispatcher.
+  /// Change the retained semantics data about this [FlutterView].
   ///
-  /// If [semanticsEnabled] is true, the user has requested that this function
-  /// be called whenever the semantic content of this platform dispatcher
+  /// If [PlatformDispatcher.semanticsEnabled] is true, the user has requested that this function
+  /// be called whenever the semantic content of this [FlutterView]
   /// changes.
   ///
-  /// In either case, this function disposes the given update, which means the
-  /// semantics update cannot be used further.
+  /// This function disposes the given update, which means the semantics update
+  /// cannot be used further.
   void updateSemantics(SemanticsUpdate update) => _updateSemantics(update);
 
   @FfiNative<Void Function(Pointer<Void>)>('PlatformConfigurationNativeApi::UpdateSemantics')

lib/web_ui/lib/src/engine/platform_dispatcher.dart

@@ -690,36 +690,8 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
         _onAccessibilityFeaturesChanged, _onAccessibilityFeaturesChangedZone);
   }
 
-  /// Change the retained semantics data about this window.
-  ///
-  /// If [semanticsEnabled] is true, the user has requested that this function
-  /// be called whenever the semantic content of this window changes.
-  ///
-  /// In either case, this function disposes the given update, which means the
-  /// semantics update cannot be used further.
   @override
-<<<<<<< HEAD
-  @Deprecated('''
-<<<<<<< HEAD
-    In a multi-view world, the platform dispatcher can no longer provide apis
-    to update semantics since each view will host its own semantics tree.
-
-    Semantics updates must be passed to an individual [FlutterView]. To update
-    semantics, use PlatformDispatcher.instance.views to get a [FlutterView] and
-    call `updateSemantics`.
-=======
-  In a multi-view world, the platform dispatcher can no longer provide apis
-  to update semantics since each view will host its own semantics tree.
-
-  Semantics updates must be passed to an individual flutter view. To update
-  semantics, use PlatformDispatcher.instance.views to get a flutter view and
-  call `updateSemantics`.
->>>>>>> ccc5c13a67 (Deprecate `platform_dispatcher` apis in favor of updateSemantics in FlutterView)
-  ''')
-  void updateSemantics(ui.SemanticsUpdate update) {
-=======
   void updateSemantics(ui.SemanticsUpdate update, [ui.FlutterView? view]) {
->>>>>>> 58037d36e1 (Testing this commit, will explain later)
     EngineSemanticsOwner.instance.updateSemantics(update);
   }