[Koha-bugs] [Bug 6496] authors appearing incorrectly in OPAC and Staff Client

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

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

--- Comment #25 from Nicole C. Engard <nengard at gmail.com> 2011-11-11 15:01:05 UTC ---
No such luck:

Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: Bug 6496 - correct the order of the author display in the OPAC
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/xslt/MARC21slim2OPACDetail.xsl
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
Failed to merge in the changes.
Patch failed at 0001 Bug 6496 - correct the order of the author display in the
OPAC
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
nengard at debian:~/kohaclone$

-- 
Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA Contact for the bug.
You are watching all bug changes.