From: x99bachelart <x99bachelart>
Date: Sat, 27 Sep 2003 11:48:11 +0000 (+0000)
Subject: conflict
X-Git-Tag: 1.8~397
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=2d795cbddc12afec47b18678b2c5e799548e32ed;p=banana.git

conflict
---

diff --git a/install.d/config.inc.php b/install.d/config.inc.php
index 69f9bc4..a6e2c64 100644
--- a/install.d/config.inc.php
+++ b/install.d/config.inc.php
@@ -1,4 +1,11 @@
 <?php
+/********************************************************************************
+* install.d/config.inc.php : configuration file
+* --------------------------
+*
+* This file is part of the banana distribution
+* Copyright: See COPYING files that comes with this distribution
+********************************************************************************/
 
 /** comparison function for the overview 
  * @param $a OBJECT spoolhead