fix

express-server/public/javascripts/login.js

@@ -73,7 +73,7 @@ var vue = new Vue({
         }
 
     },
-<<<<<<< HEAD
+
     mounted() {
         /*axios.post('/user', {
             message_id: 'test',
@@ -85,7 +85,7 @@ var vue = new Vue({
             console.log(error);
           });*/
     }
-=======
+
     // mounted() {
     //     axios.post('/user', {
     //         message_id: 'test',
@@ -97,5 +97,5 @@ var vue = new Vue({
     //         console.log(error);
     //       });
     // }
->>>>>>> 51e8fe7ad3886f317cd447a9b70b535cd6668806
+
 });

express-server/public/ocrscan/ocrscan.js

@@ -44,11 +44,11 @@ var config = {
   firebase.initializeApp(config);
 
   getAllShoppinglists();
-<<<<<<< HEAD
+
   updateUser();
   displayShoppinglist();
-=======
->>>>>>> 51e8fe7ad3886f317cd447a9b70b535cd6668806
+
+
 
 function movePurchases(text) {
     firebase.auth().onAuthStateChanged(function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) {