[Koha-bugs] [Bug 5738] Display the URI in 856u as an Image

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

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

--- Comment #21 from Jared Camins-Esakov <jcamins at cpbibliography.com> 2011-03-22 12:15:42 UTC ---
Doug,

I am unable to apply the third patch:

Commit Body is:
--------------------------
Bug 5738 Display 856u as image - system prefs
--------------------------
Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: Bug 5738 Display 856u as image - system prefs
fatal: sha1 information is lacking or useless
(installer/data/mysql/de-DE/mandatory/sysprefs.sql).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 5738 Display 856u as image - system prefs
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".

There is also some rebasing needed for the first patch, but I was able to do
that no problem, and once I figure out why the images will only display in the
OPAC Details page, I will reupload it.

Regards,
Jared

-- 
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.