gitignore remove <<<<<<< HEAD rest
This commit is contained in:
parent
c85dddf275
commit
92a553ee96
1 changed files with 0 additions and 1 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -5,7 +5,6 @@
|
||||||
/*.zip
|
/*.zip
|
||||||
/testxmlrpc.php
|
/testxmlrpc.php
|
||||||
/test.php
|
/test.php
|
||||||
<<<<<<< HEAD
|
|
||||||
*.db
|
*.db
|
||||||
*~
|
*~
|
||||||
DEADJOE
|
DEADJOE
|
||||||
|
|
Loading…
Reference in a new issue