https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=40841
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #18 from David Nind <[email protected]> --- The patches no longer apply 8-(... git bz apply 40841 Bug 40841 - Limit z39.50 targets to specific branches 188602 - Bug 40841: DB changes 188603 - Bug 40841: Add Z39.50 library limits 188604 - Bug 40841: DBIC schema [DO NOT PUSH] 188605 - Bug 40841: Add limits configuration UI 188606 - Bug 40841: Implement library limits on Z39.50 searches Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 40841: DB changes Applying: Bug 40841: Add Z39.50 library limits Applying: Bug 40841: DBIC schema [DO NOT PUSH] Applying: Bug 40841: Add limits configuration UI Applying: Bug 40841: Implement library limits on Z39.50 searches Using index info to reconstruct a base tree... M cataloguing/editor.pl Falling back to patching base and 3-way merge... Auto-merging cataloguing/editor.pl CONFLICT (content): Merge conflict in cataloguing/editor.pl error: Failed to merge in the changes. Patch failed at 0001 Bug 40841: Implement library limits on Z39.50 searches -- 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/
