Fixed merge conflict

This commit is contained in:
laf
2015-06-09 14:36:45 +01:00
53 changed files with 1861 additions and 318 deletions
+4 -4
View File
@@ -16,10 +16,10 @@
include("includes/defaults.inc.php");
include("config.php");
include("includes/definitions.inc.php");
include("includes/syslog.php");
include("includes/dbFacile.php");
include("includes/common.php");
include("includes/functions.php");
include_once("includes/syslog.php");
include_once("includes/dbFacile.php");
include_once("includes/common.php");
include_once("includes/functions.php");
$i = "1";