https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28901
David Nind <da...@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |da...@davidnind.com Status|Needs Signoff |Patch doesn't apply --- Comment #8 from David Nind <da...@davidnind.com> --- Patch no longer applies 8-(.. Applying: Bug 28901: showCart incorrectly calculates position if content above navbar Using index info to reconstruct a base tree... M koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss M koha-tmpl/opac-tmpl/bootstrap/js/basket.js Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/js/basket.js CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/js/basket.js Auto-merging koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss error: Failed to merge in the changes. Patch failed at 0001 Bug 28901: showCart incorrectly calculates position if content above navbar -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org https://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/