fix database.php.inc
merge conflict
Merge pull request #26 from mhenningsd/master

fix database.php.inc