fixing failed merge in updatedatabase
authorJoshua Ferraro <jmf@liblime.com>
Fri, 9 Nov 2007 01:07:45 +0000 (19:07 -0600)
committerJoshua Ferraro <jmf@liblime.com>
Fri, 9 Nov 2007 01:09:00 +0000 (19:09 -0600)
commite7bbd2bbc2849063c5e69be54cc05eb1ced1058d
tree5a12fd5b4e7c938b8634de96aa302dbed4ee0398
parenta740bcda76563a4005a28f685912c3d489c971df
fixing failed merge in updatedatabase

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
updater/updatedatabase