Merge conflict in template/package.json

uiwjs · Aug 13, 2020 · 4ebecfd · 4ebecfd
2 parents 5e1c24b + 3e351ce
commit 4ebecfd
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/template/package.json b/template/package.json
@@ -24,10 +24,10 @@
     "@uiw/react-native": "1.7.4",
     "react": "16.13.1",
     "react-native": "0.63.2",
-    "react-native-device-info": "5.6.3",
+    "react-native-device-info": "5.6.4",
     "react-native-gesture-handler": "1.7.0",
     "react-native-reanimated": "1.10.0",
-    "react-native-safe-area-context": "3.1.1",
+    "react-native-safe-area-context": "3.1.4",
     "react-native-screens": "2.9.0",
     "react-native-svg": "12.1.0",
     "react-redux": "7.2.0",
@@ -43,7 +43,7 @@
     "jest": "25.1.0",
     "lint-staged": "10.2.11",
     "metro-react-native-babel-preset": "0.59.0",
-    "mocker-api": "2.3.0",
+    "mocker-api": "2.3.1",
     "prettier": "2.0.5",
     "react-test-renderer": "16.13.1"
   },