php-func-lib/.gitignore at a30fd218420aa434292f475c6420d382526cf3b8 - php-func-lib - git seems legit

pub/php-func-lib

admin a30fd21842 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

13 lines

195 B

Plaintext

Raw Blame History

 <<<<<<< 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