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
2021-05-09 18:13:15 +02:00
parent 57421ead5e 06a3112617
commit a30fd21842
6 changed files with 236 additions and 1 deletions
--- a/sql.php
+++ b/sql.php
@@ -196,4 +196,8 @@ class SQL {
    // echo 'DESTROY';
  }
 }
+<<<<<<< HEAD
 ?>
+=======
+?>
+>>>>>>> branch 'master' of https://git.seemsleg.it/pub/php-func-lib.git