[Koha-bugs] [Bug 9223] Multiple values of AdvancedSearchTypes in suggestions

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9223

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #71 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Sorry, but this patch no longer applies:

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 9223: Multiple values of AdvancedSearchTypes in suggestions
Using index info to reconstruct a base tree...
M       C4/Koha.pm
M       koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
M       opac/opac-suggestions.pl
M       suggestion/suggestion.pl
Falling back to patching base and 3-way merge...
Auto-merging suggestion/suggestion.pl
CONFLICT (content): Merge conflict in suggestion/suggestion.pl
Auto-merging opac/opac-suggestions.pl
CONFLICT (content): Merge conflict in opac/opac-suggestions.pl
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
Auto-merging C4/Koha.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 9223: Multiple values of AdvancedSearchTypes in
suggestions
The copy of the patch that failed is found in:
   /home/katrin/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/Bug-9223-Multiple-values-of-AdvancedSearchTypes-in-GRz_gw.patch

-- 
You are receiving this mail because:
You are watching all bug changes.