Skip to content

Commit 0ed787d

Browse files
committed
Fix last merge conflict in FWFWebViewHostApi.m
1 parent 938f8e5 commit 0ed787d

1 file changed

Lines changed: 0 additions & 4 deletions

File tree

packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebViewHostApi.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,6 @@ - (void)reloadWebViewWithIdentifier:(NSInteger)identifier
276276
}
277277

278278
- (void)
279-
<<<<<<< HEAD
280279
setAllowsLinkPreviewForWebViewWithIdentifier:(nonnull NSNumber *)identifier
281280
isAllowed:(nonnull NSNumber *)allow
282281
error:(FlutterError *_Nullable __autoreleasing *_Nonnull)
@@ -285,10 +284,7 @@ - (void)reloadWebViewWithIdentifier:(NSInteger)identifier
285284
}
286285

287286
- (void)
288-
setNavigationDelegateForWebViewWithIdentifier:(nonnull NSNumber *)identifier
289-
=======
290287
setNavigationDelegateForWebViewWithIdentifier:(NSInteger)identifier
291-
>>>>>>> origin/main
292288
delegateIdentifier:(nullable NSNumber *)navigationDelegateIdentifier
293289
error:
294290
(FlutterError *_Nullable __autoreleasing *_Nonnull)

0 commit comments

Comments
 (0)