fix

2019-02-20 20:40:06 +01:00
parent 67319cef26
commit 4ed6ae52bf
2 changed files with 6 additions and 6 deletions
--- a/express-server/public/ocrscan/ocrscan.js
+++ b/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) {