]> git.koha-community.org Git - koha.git/commit
fixing conflict in updatedatabase
authorJoshua Ferraro <jmf@liblime.com>
Tue, 30 Oct 2007 02:13:47 +0000 (21:13 -0500)
committerJoshua Ferraro <jmf@liblime.com>
Tue, 30 Oct 2007 02:21:18 +0000 (21:21 -0500)
commit4421616991abf97bbd73a55a554dabc39e9c9d83
treeacf8e54fbfd0827037fa2cadf7aeafaeece3026c
parentf3fac7a5624fe4fcc6143c59403f892df4d9ac33
fixing conflict in updatedatabase

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