[Koha-bugs] [Bug 17664] Silence non-zebra warnings in t/db_dependent/Search.t

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

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17664

Alex Buckley <alexbuckley at catalyst.net.nz> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |alexbuckley at catalyst.net.nz
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #6 from Alex Buckley <alexbuckley at catalyst.net.nz> ---
Hi

Can you please merge this patch with the current master as I get this merge
error whilst applying


57686 - Bug 17664 - Silence non-zebra warnings in t/db_dependent/Search.t

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 17664 - Silence non-zebra warnings in t/db_dependent/Search.t
Using index info to reconstruct a base tree...
M       t/db_dependent/Search.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Search.t
CONFLICT (content): Merge conflict in t/db_dependent/Search.t
Failed to merge in the changes.
Patch failed at 0001 Bug 17664 - Silence non-zebra warnings in
t/db_dependent/Search.t
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/Bug-17664---Silence-non-zebra-warnings-in-tdbdepen-lNEMGe.patch

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