résolution conflit
Showing
- backend/server.js 0 additions, 0 deletionsbackend/server.js
- package-lock.json 431 additions, 269 deletionspackage-lock.json
- package.json 6 additions, 2 deletionspackage.json
- public/javascript/classification-result.js 1 addition, 2 deletionspublic/javascript/classification-result.js
- public/javascript/main.js 866 additions, 831 deletionspublic/javascript/main.js
- public/javascript/websocketSwitch.js 224 additions, 0 deletionspublic/javascript/websocketSwitch.js
- src/App.vue 41 additions, 0 deletionssrc/App.vue
- src/assets/javascript/app.js 871 additions, 0 deletionssrc/assets/javascript/app.js
- src/main.js 2 additions, 0 deletionssrc/main.js
- src/mixins/createdHook.js 0 additions, 0 deletionssrc/mixins/createdHook.js
- src/store/index.js 92 additions, 11 deletionssrc/store/index.js
- src/views/ConnexionView.vue 4 additions, 1 deletionsrc/views/ConnexionView.vue
- src/views/LangueView.vue 8 additions, 1 deletionsrc/views/LangueView.vue
- src/views/ProjectDuo.vue 122 additions, 4 deletionssrc/views/ProjectDuo.vue
- src/views/ProjectSolo.vue 120 additions, 1 deletionsrc/views/ProjectSolo.vue
Please register or sign in to comment