Merge branch 'shiyunjie'

# Conflicts: # ios/BasicApp.xcodeproj/project.xcworkspace/xcuserdata/shiyunjie.xcuserdatad/UserInterfaceState.xcuserstate

Merge branch 'shiyunjie'
d626cb57 · shiyunjie · 23312dbc · 836d8efd · d626cb57 · d626cb57
Commit d626cb57 authored Jul 29, 2019 by shiyunjie
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

UserInterfaceState.xcuserstate ...data/shiyunjie.xcuserdatad/UserInterfaceState.xcuserstate +0 -0

package.json package.json +1 -1

No files found.
--- a/ios/BasicApp.xcodeproj/project.xcworkspace/xcuserdata/shiyunjie.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/ios/BasicApp.xcodeproj/project.xcworkspace/xcuserdata/shiyunjie.xcuserdatad/UserInterfaceState.xcuserstate
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
    "react-native-super-grid": "^3.0.7",
    "react-native-svg": "^9.5.1",
    "react-native-swiper": "^1.5.14",
-    "react-native-tab-view": "^2.7.1",
+    "react-native-tab-view": "2.7.1",
    "react-native-vector-icons": "^6.4.2",
    "react-navigation": "^3.11.0",
    "react-navigation-redux-helpers": "^3.0.2",