https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14048 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #60 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Applying: Bug 14048: Hook new rules into C4::Circulation Using index info to reconstruct a base tree... M C4/Circulation.pm Falling back to patching base and 3-way merge... Auto-merging C4/Circulation.pm CONFLICT (content): Merge conflict in C4/Circulation.pm -- You are receiving this mail because: You are watching all bug changes.