merge

secret.php.example

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <?php 
 if (!defined('SQL_LOG')) define ( 'SQL_LOG', 1 ); // schreibt sql querys in eine log
 
@@ -8,15 +7,4 @@ $_m['pass'] = '';
 $_m['data'] = '';
 $_m['pre']  = 'efcms2_';
 $_m['salt'] = '';
-=======
-<?php 
-if (!defined('SQL_LOG')) define ( 'SQL_LOG', 1 ); // schreibt sql querys in eine log
-
-$_m['host'] = 'localhost'; 
-$_m['user'] = '';
-$_m['pass'] = '';
-$_m['data'] = '';
-$_m['pre']  = 'efcms2_';
-$_m['salt'] = '';
->>>>>>> branch 'master' of https://git.seemsleg.it/pub/php-func-lib.git
 ?>