https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10659
Dilan Johnpullé <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #12 from Dilan Johnpullé <[email protected]> --- Attempted to apply but ran into merge fails: $ git bz apply -s 10659 Bug 10659 - Upgrade jQuery star ratings plugin 76487 - Bug 10659: Upgrade jQuery star ratings plugin 76488 - Bug 10659: (follow-up) Add plugin information to the about page 76489 - Bug 10659: (follow-up) Compiled CSS Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 10659: Upgrade jQuery star ratings plugin 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 M koha-tmpl/opac-tmpl/bootstrap/less/opac.less Falling back to patching base and 3-way merge... Removing koha-tmpl/opac-tmpl/bootstrap/lib/jquery/plugins/jquery.rating.js Auto-merging koha-tmpl/opac-tmpl/bootstrap/less/opac.less Removing koha-tmpl/opac-tmpl/bootstrap/images/star-ratings-sprite.png Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt Removing koha-tmpl/opac-tmpl/bootstrap/css/jquery.rating.css Applying: Bug 10659: (follow-up) Add plugin information to the about page Applying: Bug 10659: (follow-up) Compiled CSS Using index info to reconstruct a base tree... M koha-tmpl/opac-tmpl/bootstrap/css/opac.css Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/css/opac.css CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/css/opac.css Failed to merge in the changes. Patch failed at 0001 Bug 10659: (follow-up) Compiled CSS 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-10659-follow-up-Compiled-CSS-XWX9Pf.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
