http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11999 Liz Rea <liz@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |liz@catalyst.net.nz Status|Needs Signoff |Patch doesn't apply --- Comment #30 from Liz Rea <liz@catalyst.net.nz> --- Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Holds.t CONFLICT (content): Merge conflict in t/db_dependent/Holds.t Auto-merging reserve/request.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt -- You are receiving this mail because: You are watching all bug changes.