resolve conflict, comment out my custom database code that I use
authorMichael J. Rubinsky <mrubinsk@horde.org>
Wed, 10 Jun 2009 16:28:50 +0000 (12:28 -0400)
committerMichael J. Rubinsky <mrubinsk@horde.org>
Wed, 10 Jun 2009 16:29:51 +0000 (12:29 -0400)
commitdc82ad3749871f2fe0f7431f172ceb0f44396432
tree0b6392fd5a73270aaf80797b878a76d2adb365df
parentcfb05c70313dc382b67f984f7f718f24b3b3bfb1
resolve conflict, comment out my custom database code that I use
for profiling these tests.
framework/Image/tests/im.php