Corrections conflicts

composer.json

@@ -11,4 +11,5 @@
     "ext-pdo_sqlite": "*",
     "twig/twig":"^2.0"
   }
+  
 }

public/index.php

@@ -5,6 +5,7 @@ require "../config.php";
 require "../sql/database.php";
 require "utils.php";
 
+
 use App\Connexion;
 use App\Controller\FrontController;
 use App\Controller\EditorController;
@@ -32,3 +33,4 @@ $frontController->route();
 //$sampleFormController = new SampleFormController(new FormResultGateway($con), $twig);
 //$editorController = new EditorController(new TacticModel(new TacticInfoGateway($con)));
 
+

src/Controller/FrontController.php

@@ -13,6 +13,7 @@ use App\Http\ViewHttpResponse;
 use App\Validation\ValidationFail;
 use Twig\Loader\FilesystemLoader;
 
+
 class FrontController{
 
     private AltoRouter $router;

src/Controller/UserController.php

@@ -13,5 +13,3 @@ class UserController {
 
     }
 }
-
-?>