merge

2021-05-10 13:27:51 +02:00
parent d8f5fd7f3a
commit 234e187a54
5 changed files with 0 additions and 190 deletions
--- a/sql.php
+++ b/sql.php
@@ -196,8 +196,4 @@ class SQL {
    // echo 'DESTROY';
  }
 }
-<<<<<<< HEAD
 ?>
-=======
-?>
->>>>>>> branch 'master' of https://git.seemsleg.it/pub/php-func-lib.git