https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21572
Marie-Luce Laflamme <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |marie-luce.laflamme@inlibro | |.com --- Comment #14 from Marie-Luce Laflamme <[email protected]> --- patch does not apply CONFLICT (content): Merge conflict in C4/Circulation.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 21572: Unify checkout policy of reserved items in SIP, SCO, and intranet Use 'git am --show-current-patch' to see the failed patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-21572-Unify-checkout-policy-of-reserved-items--bkchx6.patch -- 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/
