From c11f0385401796b4500f7f222f6ee8e4065b2b32 Mon Sep 17 00:00:00 2001
From: nox <daniel.leporini@gmail.com>
Date: Sat, 26 Oct 2019 01:48:53 +0200
Subject: [PATCH] Renvoi du fichier de conf.php

---
 .gitignore      | 1 -
 config/conf.php | 7 ++-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9a5ad6d..03c4c38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 config/config.php
-config/conf.php
 .idea
 /public/uploads
 /tmp
diff --git a/config/conf.php b/config/conf.php
index b8c7df8..6268872 100644
--- a/config/conf.php
+++ b/config/conf.php
@@ -1,7 +1,4 @@
 <?php
-   $host = 'localhost';
-   //$username = 'guser';
-   $username = 'root';
-   //$password = 'kptgT81U7nzYWHBdQ9';
-   $password = 'root';
+   $username = 'guser';
+   $password = 'kptgT81U7nzYWHBdQ9';
    $database_name = 'gmarche';