From 34987d3e8b2802d814f33dd9bb85c1f788f6351f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Aug 2013 13:02:13 +0200
Subject: [PATCH] Exclude conf.php file from git

---
 htdocs/conf/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/conf/.gitignore b/htdocs/conf/.gitignore
index da65ac7c6c9..ed21fdfaa4c 100644
--- a/htdocs/conf/.gitignore
+++ b/htdocs/conf/.gitignore
@@ -1,3 +1,4 @@
+/conf.php
 /conf.php.old
 /conf.php.sav
 /conf.php.mysql