There is no conflict
Showing
- game_adefinir/laravel_project/app/Http/Controllers/GameController.php 3 additions, 3 deletions...r/laravel_project/app/Http/Controllers/GameController.php
- game_adefinir/laravel_project/app/Models/Employes.php 1 addition, 1 deletiongame_adefinir/laravel_project/app/Models/Employes.php
- game_adefinir/laravel_project/database/User.db 0 additions, 0 deletionsgame_adefinir/laravel_project/database/User.db
- game_adefinir/laravel_project/resources/views/chart.blade.php 19 additions, 2 deletions..._adefinir/laravel_project/resources/views/chart.blade.php
- game_adefinir/laravel_project/resources/views/game.blade.php 14 additions, 13 deletionsgame_adefinir/laravel_project/resources/views/game.blade.php
- game_adefinir/laravel_project/resources/views/welcome.blade.php 1 addition, 1 deletion...definir/laravel_project/resources/views/welcome.blade.php
Please register or sign in to comment