Skip to content

Commit 94f6660

Browse files
committed
fixed bad merge
1 parent e655d71 commit 94f6660

File tree

1 file changed

+26
-37
lines changed

1 file changed

+26
-37
lines changed

packages/ferric/package.json

Lines changed: 26 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,28 @@
11
{
2-
"name": "ferric-cli",
3-
"version": "0.3.2",
4-
"description": "Rust Node-API Modules for React Native",
5-
"homepage": "https://github.com/callstackincubator/react-native-node-api",
6-
"repository": {
7-
"type": "git",
8-
"url": "git+https://github.com/callstackincubator/react-native-node-api.git",
9-
"directory": "packages/ferric"
10-
},
11-
"type": "module",
12-
"bin": {
13-
"ferric": "./bin/ferric.js"
14-
},
15-
"scripts": {
16-
"start": "tsx src/run.ts"
17-
},
18-
"dependencies": {
19-
"@napi-rs/cli": "~3.0.3",
20-
<<<<<<< HEAD
21-
"@commander-js/extra-typings": "^13.1.0",
22-
"bufout": "^0.3.2",
23-
"chalk": "^5.4.1",
24-
"commander": "^13.1.0",
25-
"react-native-node-api": "workspace:*",
26-
"ora": "^8.2.0"
27-
||||||| 0d97e50
28-
"@commander-js/extra-typings": "^13.1.0",
29-
"bufout": "^0.3.2",
30-
"chalk": "^5.4.1",
31-
"commander": "^13.1.0",
32-
"react-native-node-api": "0.3.3",
33-
"ora": "^8.2.0"
34-
=======
35-
"@react-native-node-api/cli-utils": "0.1.0",
36-
"react-native-node-api": "0.5.0"
37-
>>>>>>> upstream/main
38-
}
2+
"name": "ferric-cli",
3+
"version": "0.3.2",
4+
"description": "Rust Node-API Modules for React Native",
5+
"homepage": "https://github.com/callstackincubator/react-native-node-api",
6+
"repository": {
7+
"type": "git",
8+
"url": "git+https://github.com/callstackincubator/react-native-node-api.git",
9+
"directory": "packages/ferric"
10+
},
11+
"type": "module",
12+
"bin": {
13+
"ferric": "./bin/ferric.js"
14+
},
15+
"scripts": {
16+
"start": "tsx src/run.ts"
17+
},
18+
"dependencies": {
19+
"@napi-rs/cli": "~3.0.3",
20+
"@commander-js/extra-typings": "^13.1.0",
21+
"bufout": "^0.3.2",
22+
"chalk": "^5.4.1",
23+
"commander": "^13.1.0",
24+
"react-native-node-api": "workspace:*",
25+
"ora": "^8.2.0",
26+
"@react-native-node-api/cli-utils": "workspace:*"
27+
}
3928
}

0 commit comments

Comments
 (0)