https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25813
Matthias Le Gac <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #4 from Matthias Le Gac <[email protected]> --- I can't apply le patch Applying: Bug 25813: Enhance patron expiration in SIP display Using index info to reconstruct a base tree... M C4/SIP/ILS/Patron.pm M t/db_dependent/SIP/Patron.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/SIP/Patron.t Auto-merging C4/SIP/ILS/Patron.pm CONFLICT (content): Merge conflict in C4/SIP/ILS/Patron.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 25813: Enhance patron expiration in SIP display -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://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/
