[Koha-bugs] [Bug 12460] Search history: Combine to start a new search

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

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

Rochelle Healy <rochellehealy.student at wegc.school.nz> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |rochellehealy.student at wegc.
                   |                            |school.nz
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #5 from Rochelle Healy <rochellehealy.student at wegc.school.nz> ---
We tried applying bug 11430 first but it still doesn't apply, 

Applying: Bug 12460: Allow to start a new search from multiple search history
lines
fatal: sha1 information is lacking or useless
(koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 12460: Allow to start a new search from multiple
search history lines
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-12460-Allow-to-start-a-new-search-from-multipl-UuxtJ9.patch

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