From 5322ff1b087607a4da38b11a1387c7673341ea2f Mon Sep 17 00:00:00 2001
From: horhik <horhik@tuta.io>
Date: Tue, 17 Mar 2020 09:53:38 -0300
Subject: [PATCH] fix pull request package.json confilct

---
 package.json | 40 ----------------------------------------
 1 file changed, 40 deletions(-)

diff --git a/package.json b/package.json
index dfb2f1d..e94eacd 100644
--- a/package.json
+++ b/package.json
@@ -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
 }