dergeorg/SmartShopper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Lukas Nowy 2019-02-20 20:40:06 +01:00
parent 67319cef26
commit 4ed6ae52bf
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
express-server/public/javascripts/login.js
View File

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

6
express-server/public/ocrscan/ocrscan.js
View File

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