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

7
.gitignore vendored
View File

@@ -1,5 +1,12 @@
<<<<<<< HEAD
/.buildpath
/.project
/secret.php
/config.php
=======
/.buildpath
/.project
/secret.php
/config.php
>>>>>>> branch 'master' of https://git.seemsleg.it/pub/php-func-lib.git
/test.php