From 00dbaf90bc44ef3ed0abaebb15307756e054a027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Fri, 20 Sep 2013 10:21:39 +0200
Subject: merge #224

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 25818a8d..b73c4b40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,4 @@ composer.phar
 db/poche.sqlite
 output
 phpdoc*
-inc/poche/myconfig.inc.php
\ No newline at end of file
+inc/poche/config.inc.php
\ No newline at end of file
-- 
cgit v1.2.3