Horhik
/
Ankilan
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

fix pull request package.json confilct

This commit is contained in:
horhik 2020-03-17 09:53:38 -03:00
parent c8c7666289
commit 5322ff1b08
1 changed files with 0 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
package.json
View File

@ -1,43 +1,4 @@
{
<<<<<<< HEAD
"name": "ankilan",
"version": "0.0.1",
"private": true,
"scripts": {
"android": "react-native run-android",
"ios": "react-native run-ios",
"start": "react-native start",
"test": "jest",
"lint": "eslint .",
"postinstall": "remotedev-debugger"
},
"dependencies": {
"native-base": "^2.13.8",
"react": "16.9.0",
"react-native": "0.61.5",
"react-native-ankidroid": "^0.4.0",
"react-native-material-textfield": "^0.16.1",
"react-redux": "^7.2.0",
"redux": "^4.0.5",
"redux-devtools-extension": "^2.13.8",
"redux-thunk": "^2.3.0",
"remote-redux-devtools": "^0.5.16"
},
"devDependencies": {
"@babel/core": "^7.6.2",
"@babel/runtime": "^7.6.2",
"@react-native-community/eslint-config": "^0.0.5",
"babel-jest": "^24.9.0",
"eslint": "^4.18.2",
"jest": "^24.9.0",
"metro-react-native-babel-preset": "^0.56.0",
"react-test-renderer": "16.9.0",
"remotedev-rn-debugger": "^0.8.4"
},
"jest": {
"preset": "react-native"
}
=======
"name": "ankilan",
"version": "0.0.1",
"private": true,
@ -80,5 +41,4 @@
"jest": {
"preset": "react-native"
}
>>>>>>> master
}