Skip to content

Commit 8a2784b

Browse files
chore: resolve merge conflict
1 parent 9f04f60 commit 8a2784b

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

example/ios/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ PODS:
88
- hermes-engine (0.78.2):
99
- hermes-engine/Pre-built (= 0.78.2)
1010
- hermes-engine/Pre-built (0.78.2)
11-
- MendixNative (0.2.0):
11+
- MendixNative (0.1.3):
1212
- DoubleConversion
1313
- glog
1414
- hermes-engine
@@ -1851,7 +1851,7 @@ SPEC CHECKSUMS:
18511851
fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
18521852
glog: eb93e2f488219332457c3c4eafd2738ddc7e80b8
18531853
hermes-engine: 2771b98fb813fdc6f92edd7c9c0035ecabf9fee7
1854-
MendixNative: 05a3f12b7a5f2de19da41cbe39ab435901b2c0f9
1854+
MendixNative: 36190d86a65cb57b351c6396bc1349a7823206b0
18551855
op-sqlite: 12554de3e1a0cb86cbad3cf1f0c50450f57d3855
18561856
OpenSSL-Universal: 6082b0bf950e5636fe0d78def171184e2b3899c2
18571857
RCT-Folly: e78785aa9ba2ed998ea4151e314036f6c49e6d82

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "mendix-native",
3-
"version": "0.2.0",
3+
"version": "0.1.3",
44
"description": "Mendix native mobile package",
55
"main": "./lib/module/index.js",
66
"types": "./lib/typescript/src/index.d.ts",

0 commit comments

Comments
 (0)