[Koha-bugs] [Bug 10659] Upgrade jQuery star ratings plugin

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

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

Cab Vinton <bibliwho at gmail.com> changed:

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

--- Comment #16 from Cab Vinton <bibliwho at gmail.com> ---
The sandbox you've requested is not ready.
Some problems occurred applying patches from bug 10659:
<h1>Something went wrong !</h1>Applying: Bug 10659: Upgrade jQuery star ratings
plugin
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
Falling back to patching base and 3-way merge...
Removing koha-tmpl/opac-tmpl/bootstrap/lib/jquery/plugins/jquery.rating.js
Removing koha-tmpl/opac-tmpl/bootstrap/images/star-ratings-sprite.png
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
Removing koha-tmpl/opac-tmpl/bootstrap/css/jquery.rating.css
Patch failed at 0001 Bug 10659: Upgrade jQuery star ratings plugin
The copy of the patch that failed is found in: .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.
Bug 10659 - Upgrade jQuery star ratings plugin

77740 - Bug 10659: Upgrade jQuery star ratings plugin
77741 - Bug 10659: (follow-up) Add plugin information to the about page

Apply? [(y)es, (n)o, (i)nteractive] Patch left in
/tmp/Bug-10659-Upgrade-jQuery-star-ratings-plugin-4vjbbb.patch .

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