[Koha-bugs] [Bug 5888] opac-detail subject/author links improvements

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

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

Melia Meggs <melia at bywatersolutions.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |melia at bywatersolutions.com
   Patch complexity|---                         |Medium patch

--- Comment #34 from Melia Meggs <melia at bywatersolutions.com> ---
I can't get this to apply, sorry.  I tried first with git bz apply 5888
Bug 5888 - opac-detail subject/author links improvements

[SIGNED-OFF] Bug 5888: opac-detail subject/author links improvements
Apply? [yn] y

Applying: Bug 5888: opac-detail subject/author links improvements
error: patch failed: koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt:293
error: koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt: patch does not apply
Patch failed at 0001 Bug 5888: opac-detail subject/author links improvements

I also tried with git am -iu3
Applying: Bug 5888: opac-detail subject/author links improvements
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/opac-tmpl/prog/en/css/opac.css
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 5888: opac-detail subject/author links improvements

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