https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15418 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA CC| |katrin.fischer@bsz-bw.de --- Comment #3 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Patch doesn't apply. Opting for 'Failed QA' because of Srdjan's comment#2. Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 15418 Use Fork Net::Server personality for sip Using index info to reconstruct a base tree... M C4/SIP/SIPServer.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/SIPServer.pm CONFLICT (content): Merge conflict in C4/SIP/SIPServer.pm Failed to merge in the changes. Patch failed at 0001 Bug 15418 Use Fork Net::Server personality for sip The copy of the patch that failed is found in: /home/vagrant/kohaclone/.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/Proposed-patch-pNkHlx.patch -- You are receiving this mail because: You are watching all bug changes.