finished merging

MocionesIUPI/App.js

@@ -4,19 +4,9 @@ import { StyleSheet, Text, View } from 'react-native';
 // importing other files
 import Navigator from './routes/homeStack';
 
-
-  // here we want to display each mocion in a flatlist 
-  // it's supposed to be like buttons. Once clicked it would let you vote inside
+export default function App() {
   return (
-      <Navigator />
-  );
+    <Navigator />
+);
 }
 
-const styles  = StyleSheet.create({
-  container: {
-    flex: 1,
-    backgroundColor: '#fff',
-    alignItems: 'center',
-    justifyContent: 'center',
-  },
-});

MocionesIUPI/package.json

@@ -26,7 +26,7 @@
     "react-native-web": "~0.18.9",
     "react-navigation-material-bottom-tabs": "^2.3.5",
     "react-navigation-stack": "^2.10.4",
-    "yarn": "^1.22.19"
+    "yarn": "^1.22.19",
     "react-native-web": "~0.18.9",
     "styled-components": "^5.3.6",
     "styled-system": "^5.1.5",