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
This commit is contained in:
7
.gitignore
vendored
7
.gitignore
vendored
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user