Merge

frontend/src/views/AdminPrivate.vue

@@ -99,19 +99,11 @@ export default {
             })
 
         }
-<<<<<<< HEAD
-    },   
-    components: {
-        LoginNavbar
-    },
-}
-=======
     },
     components:{
         LoginNavbar
     } 
 }
 
->>>>>>> 97c6d41dc424575a3414673ca6d5e508e1423274
 import LoginNavbar from '../components/LoginNavbar.vue'
 </script>
\ No newline at end of file

frontend/src/views/Login.vue

@@ -87,13 +87,8 @@ export default {
   },
     methods: {
         check: function(){
-<<<<<<< HEAD
-            let login = this.login
-            let password = this.password
-=======
             let login = this.log
             let password = this.pass
->>>>>>> 97c6d41dc424575a3414673ca6d5e508e1423274
             var bcrypt = require('bcryptjs');
             var salt = "$2a$08$c0GzKSB8g6.rZLF98GJvQu"
             var hash = bcrypt.hashSync(password, salt)