qbi/additional_plugins
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gitignore remove <<<<<<< HEAD rest

Browse source
This commit is contained in:
Ian 2013-09-12 08:48:43 +02:00
parent c85dddf275
commit 92a553ee96
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -5,7 +5,6 @@
/*.zip
/testxmlrpc.php
/test.php
<<<<<<< HEAD
*.db
*~
DEADJOE