http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11999 M. de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |m.de.rooy@rijksmuseum.nl --- Comment #11 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- CONFLICT (content): Merge conflict in t/db_dependent/Holds.t Auto-merging reserve/request.pl CONFLICT (content): Merge conflict in reserve/request.pl Auto-merging opac/opac-reserve.pl CONFLICT (content): Merge conflict in opac/opac-reserve.pl Auto-merging C4/Reserves.pm CONFLICT (content): Merge conflict in C4/Reserves.pm Auto-merging C4/ILSDI/Services.pm CONFLICT (content): Merge conflict in C4/ILSDI/Services.pm -- You are receiving this mail because: You are watching all bug changes.