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
// include ('config.php');
include_once ('sql.php');
@@ -7,4 +8,15 @@ include_once ('numbers.php');
include_once ('mail.php');
include_once ('debug.php');
include_once ('markdown.php');
=======
<?php
// include ('config.php');
include_once ('sql.php');
$sql = new SQL ();
include_once ('string.php');
include_once ('numbers.php');
include_once ('mail.php');
include_once ('debug.php');
include_once ('markdown.php');
>>>>>>> branch 'master' of https://git.seemsleg.it/pub/php-func-lib.git
?>