[Koha-bugs] [Bug 12815] Adding browser based multi-lingual jquery.ime input method support to Koha

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

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

--- Comment #33 from Marc Véron <veron at veron.ch> ---
I did:
git bz apply 12815

...and got the following:

Bug 12815 - Adding browser based multi-lingual jquery.ime input method support
to Koha

31218 - Adds the jQuery.IME library for staff client
31219 - Adds the jQuery.IME library for OPAC
31220 - Adds jQuery.IME support to the OPAC
31221 - Adds jQuery.IME support to the staff client
31231 - Correct typo in UsejQueryIMEonOPAC syspref in i18n_l10n.pref
31232 - Correct typo in UsejQueryIMEonStaff syspref in i18n_l10n.pref
31233 - Fixes accidental deletion of jQuery Colvis license in about.tt

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 12815 [ENH] Patch 1 of 4 - Adds jquery.ime libs for staff client
Applying: Bug 12815 [ENH] Patch 2 of 4 - Add jquery.ime lib for staff client
Applying: Bug 12815 [ENH] Patch 3 of 4 - Add jQuery.IME support to OPAC
Applying: Bug 12815 [ENH] Patch 4 of 4 - Add jQuery.IME support to staff client
Applying: Bug 12815 [ENH] Removes UsejQueryIMEonOPAC syspref typo in
i18n_l10n.pref
Applying: Bug 12815 [ENH] Removes UsejQueryIMEonStaff syspref typo in
i18n_l10n.pref
Applying: Bug 12815 [ENH] Fixing accidental deletion of jQuery Colvis license
info
fatal: sha1 information is lacking or useless
(koha-tmpl/intranet-tmpl/prog/en/modules/about.tt).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 12815 [ENH] Fixing accidental deletion of jQuery
Colvis license info
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in
/tmp/Fixes-accidental-deletion-of-jQuery-Colvis-license-dAwEUs.patch

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