https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14390
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #29 from Katrin Fischer <[email protected]> --- I am sorry, took me too long to get back to this - patch currently doesn't apply: Applying: Bug 14390 - Fine not updated from 'FU' to 'F' on renewal 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 I took a quick look, but not sure what caused the conflict in the first place (which change/fix in master). -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
