[Koha-bugs] [Bug 29990] Show authority heading use in search results

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

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

shi-yao.wang at inLibro.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |shi-yao.wang at inLibro.com
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #3 from shi-yao.wang at inLibro.com ---
Does not apply. Merge conflict: 


Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 29990: Add ShowHeadingUse system preference
Applying: Bug 29990: Show authority appropriate heading use on search results
Using index info to reconstruct a base tree...
M      
koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt
error: Failed to merge in the changes.
Patch failed at 0001 Bug 29990: Show authority appropriate heading use on
search results

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