[Koha-bugs] [Bug 16023] Use Font Awesome icons on audio alerts page

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

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

Nicole C. Engard <nengard at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |nengard at gmail.com

--- Comment #2 from Nicole C. Engard <nengard at gmail.com> ---
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 16023 - Use Font Awesome icons on audio alerts page
fatal: sha1 information is lacking or useless
(koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 16023 - Use Font Awesome icons on audio alerts page
The copy of the patch that failed is found in:
   /home/vagrant/kohaclone/.git/rebase-apply/patch
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/Bug-16023---Use-Font-Awesome-icons-on-audio-alerts-wqIpkQ.patch

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