Merge pull request #41 from skiser/Chase

ESLINT issue with head resolved
skiser · Oct 15, 2019 · 80a47c4 · 80a47c4
2 parents 0bbb0e1 + d6b9813
commit 80a47c4
Showing 1 changed file with 1 addition and 16 deletions.
diff --git a/Routinely/app/navigation.js b/Routinely/app/navigation.js
@@ -31,28 +31,13 @@ const AppStack = createStackNavigator(
 );
 
 export default createAppContainer(
-<<<<<<< HEAD
-    createSwitchNavigator(
-      {
-        App: AppStack,
-        Auth: AuthStack,
-        //Calendar: CalendarScreen,
-      },
-      {
-        initialRouteName: "Auth"
-      }
-    )
-  );
-=======
   createSwitchNavigator(
     {
       App: AppStack,
       Auth: AuthStack,
-      //Calendar: CalendarScreen,
     },
     {
-      initialRouteName: 'App',
+      initialRouteName: 'Auth',
     },
   ),
 );
->>>>>>> c3eb9904c6552e68d1228b82b9cc3102a266db37