Merge branch 'master' of https://git.seemsleg.it/pub/php-func-lib.git
into HEAD Conflicts: .gitignore README.md _func.php secret.php.example sql.php
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
<<<<<<< HEAD
|
||||
<?php
|
||||
if (!defined('SQL_LOG')) define ( 'SQL_LOG', 1 ); // schreibt sql querys in eine log
|
||||
|
||||
@@ -7,4 +8,15 @@ $_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
|
||||
?>
|
||||
Reference in New Issue
Block a user