routeur londres

6 months ago · 019f328d19
parent c6d05e0e97
commit 019f328d19
1 changed files with 0 additions and 5 deletions
--- a/index.php
+++ b/index.php
@ -11,12 +11,7 @@ require_once __DIR__ . '/config/config.php';

 require __DIR__ . '/vendor/autoload.php';

-
-<<<<<<< HEAD
 $co = new \Gateway\Connection('pgsql:host=localhost;dbname=dbkekentin;', 'kekentin', '');
-=======
-//$co = new \Gateway\Connection('pgsql:host=localhost;dbname=dbkekentin;', 'kekentin', 'Chocolat-77');
->>>>>>> c15b8ac10f284e05dcb48f381a22751be4dd20a9

 //twig
 $loader = new \Twig\Loader\FilesystemLoader('vue/templates');