Skip to content

Commit b39f6fe

Browse files
committed
chore: project fix
1 parent 2d862c8 commit b39f6fe

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

src/webview/index.common.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1615,7 +1615,4 @@ scalesPageToFitProperty.register(WebViewExtBase);
16151615
mediaPlaybackRequiresUserActionProperty.register(WebViewExtBase);
16161616
appCachePathProperty.register(WebViewExtBase);
16171617
limitsNavigationsToAppBoundDomainsProperty.register(WebViewExtBase);
1618-
<<<<<<< HEAD
16191618
scrollBarIndicatorVisibleProperty.register(WebViewExtBase);
1620-
=======
1621-
>>>>>>> master

src/webview/index.ios.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { isEnabledProperty } from '@nativescript/core/ui/core/view';
33
import {
44
NavigationType,
55
ViewPortProperties,
6-
WebViewTraceCategory,
76
WebViewExtBase,
7+
WebViewTraceCategory,
88
allowsInlineMediaPlaybackProperty,
99
autoInjectJSBridgeProperty,
1010
limitsNavigationsToAppBoundDomainsProperty,

src/webview/references.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/// <reference path="./types/android/webviewinterface.d.ts" />
22
/// <reference path="./types/url.d.ts" />
33
/// <reference path="./types/ios/ios.d.ts" />
4+
/// <reference path="../../node_modules/@nativescript/types-ios/lib/ios/objc-x86_64/objc!WebKit.d.ts" />

0 commit comments

Comments
 (0)