http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10498 Koha Team Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |koha@univ-lyon3.fr --- Comment #2 from Koha Team Lyon 3 <koha@univ-lyon3.fr> --- tested on a biblibre sandbox Applying: Bug 10498 - Place Hold on Order Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging acqui/neworderempty.pl CONFLICT (content): Merge conflict in acqui/neworderempty.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt Auto-merging reserve/request.pl Failed to merge in the changes. -- You are receiving this mail because: You are watching all bug changes.