Update 'App.js'

App.js

@@ -17,16 +17,6 @@ import HomeScreen from './screens/HomeScreen';
 //import Loading from './components/Loading';
 import Loading from './screens/main/Loading';
 import { firebaseConfig } from './config/firebaseConfig';
-<<<<<<< HEAD
-=======
-import { Text, View } from 'react-native';
-import { styles } from './config/styles';
-
-import HomeScreen from './screens/main/Home_page';
-import RoomScreen from './screens/main/RoomScreen'
-import { Provider} from 'react-redux'
-import { createStore, applyMiddleware } from 'redux';
->>>>>>> devErnesto
 import rootReducer from './redux/reducers'
 
 
@@ -95,16 +85,9 @@ export default class App extends Component {
     return(
       <Provider store={store}>
         <NavigationContainer>
-<<<<<<< HEAD
           <Drawer.Navigator>
             <Drawer.Screen name={" "} options={{drawerLabel: "Home", headerTransparent: true}} children={this.createHomeStack}/>
           </Drawer.Navigator>
-=======
-          <Stack.Navigator initialRouteName="Home">
-            <Stack.Screen name="Home" component={HomeScreen} />
-            <Stack.Screen name="Room" component={RoomScreen} options={({ route }) => ({ title: route.params.thread.name })} />
-          </Stack.Navigator>
->>>>>>> devErnesto
         </NavigationContainer>
       </Provider>
     );