http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10855 Brendan Gallagher <brendan@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |brendan@bywatersolutions.co | |m Status|Signed Off |Failed QA --- Comment #194 from Brendan Gallagher <brendan@bywatersolutions.com> --- Jonathan - updatabase just needs a quick rebase. Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging installer/data/mysql/kohastructure.sql Failed to merge in the changes. Patch failed at 0001 Bug 10855: Update database entry Thanks - Then I can test/qa. -Brendan -- You are receiving this mail because: You are watching all bug changes.