resolved merge conflict
This commit is contained in:
commit
45e43ea90d
1 changed files with 3 additions and 1 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -1,4 +1,6 @@
|
||||||
*.kdev4
|
*.kdev4
|
||||||
html/config.php
|
html/config.php
|
||||||
.gitignore
|
info.php
|
||||||
|
config.php
|
||||||
|
*.old
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue