Marc Delisle d1bebc67f6 fix merge conflicts

2010-10-03 09:42:40 -04:00

..

mysql.dbi.lib.php

…

mysqli.dbi.lib.php

fix merge conflicts

2010-10-03 09:42:40 -04:00