into HEAD

Conflicts:
	.gitignore
	README.md
	_func.php
	secret.php.example
	sql.php
This commit is contained in:
admin
2021-05-09 18:13:15 +02:00
6 changed files with 236 additions and 1 deletions

View File

@@ -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
?>