[Koha-bugs] [Bug 34608] Add sort1 and sort2 to patron search results

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

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

David Nind <david at davidnind.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |david at davidnind.com

--- Comment #6 from David Nind <david at davidnind.com> ---
The patch no longer applies 8-(... 

git bz apply 34608

Bug 34608 - Add sort1 and sort2 to patron search results

155343 - Bug 34608: Add sort1 and sort2 to patron search results
158194 - Bug 34608: (follow-up) Display authorized values if used

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 34608: Add sort1 and sort2 to patron search results
Using index info to reconstruct a base tree...
M       admin/columns_settings.yml
M       koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
Auto-merging admin/columns_settings.yml
error: Failed to merge in the changes.
Patch failed at 0001 Bug 34608: Add sort1 and sort2 to patron search results

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