https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15823 Marc Véron <veron@veron.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #14 from Marc Véron <veron@veron.ch> --- Sorry, does not apply on current master. Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt Auto-merging circ/circulation.pl CONFLICT (content): Merge conflict in circ/circulation.pl Failed to merge in the changes. -- You are receiving this mail because: You are watching all bug changes.