conflict

diff --git a/install.d/config.inc.php b/install.d/config.inc.php
index 69f9bc4..a6e2c64 100644 (file)
--- 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