https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20816
Jesse Maseto <je...@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |je...@bywatersolutions.com --- Comment #2 from Jesse Maseto <je...@bywatersolutions.com> --- Patch does not apply. Merge conflicts. Using index info to reconstruct a base tree... M C4/SIP/ILS/Patron.pm M C4/SIP/Sip.pm M C4/SIP/Sip/MsgType.pm M etc/SIPconfig.xml Falling back to patching base and 3-way merge... Auto-merging etc/SIPconfig.xml CONFLICT (content): Merge conflict in etc/SIPconfig.xml Auto-merging C4/SIP/Sip/MsgType.pm CONFLICT (content): Merge conflict in C4/SIP/Sip/MsgType.pm Auto-merging C4/SIP/Sip.pm Auto-merging C4/SIP/ILS/Patron.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 20816: Add ability to define custom templated fields in SIP patron responses 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-20816-Add-ability-to-define-custom-templated-f-a8rxuw.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org 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/