https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15253 Liz Rea <wizzyrea@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Patch doesn't apply --- Comment #47 from Liz Rea <wizzyrea@gmail.com> --- This seems to no longer apply: Switched to a new branch 'bug15253-qa' Bug 15253 - Add Koha::Logger based logging for SIP2 87993 - Bug 15253: Add Koha::Logger based logging for SIP2 88383 - Bug 15253: Move subs to a new module, allow unit tests to function Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 15253: Add Koha::Logger based logging for SIP2 Using index info to reconstruct a base tree... M C4/SIP/ILS.pm M C4/SIP/ILS/Item.pm M C4/SIP/ILS/Patron.pm M C4/SIP/ILS/Transaction/Checkout.pm M C4/SIP/SIPServer.pm M C4/SIP/Sip.pm M C4/SIP/Sip/MsgType.pm M Koha/Logger.pm M etc/log4perl.conf Falling back to patching base and 3-way merge... Auto-merging etc/log4perl.conf CONFLICT (content): Merge conflict in etc/log4perl.conf Auto-merging Koha/Logger.pm Auto-merging C4/SIP/Sip/MsgType.pm Auto-merging C4/SIP/Sip.pm Auto-merging C4/SIP/SIPServer.pm CONFLICT (content): Merge conflict in C4/SIP/SIPServer.pm Auto-merging C4/SIP/ILS/Transaction/Checkout.pm Auto-merging C4/SIP/ILS/Patron.pm Auto-merging C4/SIP/ILS/Item.pm Auto-merging C4/SIP/ILS.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 15253: Add Koha::Logger based logging for SIP2 The copy of the patch that failed is found in: .git/rebase-apply/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-15253-Add-KohaLogger-based-logging-for-SIP2-oaPOUQ.patch You have new mail in /var/mail/vagrant -- You are receiving this mail because: You are watching all bug changes.