https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17153
Katrin Fischer <katrin.fisc...@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA --- Comment #15 from Katrin Fischer <katrin.fisc...@bsz-bw.de> --- There is a small conflict, can you please rebase? Applying: Bug 17153 - Add logic to pass URL to output so redirct to search results can occur Using index info to reconstruct a base tree... M C4/Output.pm M opac/opac-search.pl M opac/opac-user.pl Falling back to patching base and 3-way merge... Auto-merging opac/opac-user.pl CONFLICT (content): Merge conflict in opac/opac-user.pl Auto-merging opac/opac-search.pl Auto-merging C4/Output.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 17153 - Add logic to pass URL to output so redirct to search results can occur 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-17153---Add-logic-to-pass-URL-to-output-so-red-YH0gjy.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org 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/