[Koha-bugs] [Bug 19691] Enforce OPAC SEARCH LIMIT server-side

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

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

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

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

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

Can you please rebase this as it is not applying cleanly on master as the below
output shows:

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 19691 - Move code to opac-search.pl
Using index info to reconstruct a base tree...
M       koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
M       opac/opac-search.pl
Falling back to patching base and 3-way merge...
Auto-merging opac/opac-search.pl
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
Failed to merge in the changes.
Patch failed at 0001 Bug 19691 - Move code to opac-search.pl
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-19691---Move-code-to-opac-searchpl-BrIj3i.patch

Cheers,
Alex

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