test

frontend/src/views/Inscription.vue

@@ -148,9 +148,6 @@ export default {
             
             fetch(url, params)
             .then(response=>response.json())
-<<<<<<< HEAD
-            .then(data=>console.log(data))
-=======
             .then(response=> {
                 user.token = response.jwt_token
                 user.id = response.id
@@ -158,7 +155,6 @@ export default {
             .then(this.$router.push('/'))
             
 
->>>>>>> 97c6d41dc424575a3414673ca6d5e508e1423274
         }
         },