https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18317
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #7 from David Nind <[email protected]> --- Just to confirm that the patch doesn't apply in master 8-(.. Applying: Bug 18317: Allow check out of already checked out items through SIP Using index info to reconstruct a base tree... M C4/SIP/ILS.pm M C4/SIP/ILS/Transaction/Checkout.pm M installer/data/mysql/mandatory/sysprefs.sql M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref Auto-merging installer/data/mysql/mandatory/sysprefs.sql Auto-merging C4/SIP/ILS/Transaction/Checkout.pm Auto-merging C4/SIP/ILS.pm CONFLICT (content): Merge conflict in C4/SIP/ILS.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 18317: Allow check out of already checked out items through SIP -- 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/
