mirror of
https://github.com/zhigang1992/react-navigation.git
synced 2026-03-06 22:39:41 +08:00
Fixed
This commit is contained in:
@@ -32,7 +32,11 @@ npm install --save react-navigation
|
||||
# Run the new app
|
||||
npm start
|
||||
|
||||
<<<<<<< HEAD
|
||||
# This will start a development server for you and print a QR code in your terminal.
|
||||
=======
|
||||
#This will start a development server for you, and print a QR code in your terminal.
|
||||
>>>>>>> d95f01f... #Provide intro for create-react-native-app and react-native init
|
||||
```
|
||||
|
||||
Verify that you can successfully see the bare sample app run on iOS and/or Android:
|
||||
@@ -70,7 +74,11 @@ const SimpleApp = StackNavigator({
|
||||
Home: { screen: HomeScreen },
|
||||
});
|
||||
|
||||
<<<<<<< HEAD
|
||||
// if you are using create-react-native-app you don't need this line
|
||||
=======
|
||||
//if you are using create-react-native-app you don't need this line
|
||||
>>>>>>> d95f01f... #Provide intro for create-react-native-app and react-native init
|
||||
AppRegistry.registerComponent('SimpleApp', () => SimpleApp);
|
||||
```
|
||||
|
||||
|
||||
Reference in New Issue
Block a user