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

Oops, missed a conflict marker.

Browse source
This commit is contained in:
Matthias Mees 2013-09-12 09:14:24 +02:00
parent 70da5a6895
commit fa4932ec16
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