Update 'screens/main/Home_page.js'

screens/main/Home_page.js

@@ -13,17 +13,6 @@ import { bindActionCreators } from 'redux'
 import { fetchUser } from '../../redux/actions/index'
 
 export function Home_page({navigation}) {
-<<<<<<< HEAD
-
-  return (
-    <TouchableWithoutFeedback style={styles.stdcontainer} onPress={Keyboard.dismiss} accessible={false}>
-        <ImageBackground style={styles.stdcontainer} source={require('../../assets/yellow-white.jpg')}>
-            <CustomButton marginTop={25} title="Calendar" onPress={() => navigation.navigate('Calendar')}/>
-        </ImageBackground>
-    </TouchableWithoutFeedback>
-  );
-}
-=======
   const [threads, setThreads] = useState([]);  
   const [loading, setLoading] = useState(true);
   
@@ -110,24 +99,10 @@ export function Home_page({navigation}) {
         </ImageBackground>
     );
   }
->>>>>>> devErnesto
 
 const mapStateToProps = (store) => ({
   currentUser: store.userState.currentUser
 })
 const mapDispatchProps = (dispatch) => bindActionCreators({fetchUser}, dispatch);
 
-<<<<<<< HEAD
-export default connect(mapStateToProps, mapDispatchProps)(Home_page);
-const mapStateToProps = (store) => ({
-  currentUser: store.userState.currentUser
-})
-const mapDispatchProps = (dispatch) => bindActionCreators({fetchUser}, dispatch);
-
-export default connect(mapStateToProps, mapDispatchProps)(Home_page);
-
-
-
-=======
 export default connect(mapStateToProps, mapDispatchProps)(Home_page);
->>>>>>> devErnesto