Skip to content

Commit b31114b

Browse files
committed
Solving previous merge conflict
1 parent 4a41be5 commit b31114b

File tree

4 files changed

+0
-440
lines changed

4 files changed

+0
-440
lines changed

nativescript-core/http/http-request/http-request.android.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ let imageSource: typeof imageSourceModule;
2828
function ensureImageSource() {
2929
if (!imageSource) {
3030
imageSource = require("../../image-source");
31-
imageSource = require("../../image-source");
3231
}
3332
}
3433

tns-core-modules/application/application-common.ts

Lines changed: 0 additions & 131 deletions
This file was deleted.

tns-core-modules/bundle-entry-points.ts

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)