https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21174
Jesse Maseto <je...@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |je...@bywatersolutions.com --- Comment #17 from Jesse Maseto <je...@bywatersolutions.com> --- PATCH DOESNT APPLY. Applying: Bug 21174: (alternate) Sysprefs to enable the opening of OPAC cart in one click Using index info to reconstruct a base tree... M koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc Failed to merge in the changes. Patch failed at 0001 Bug 21174: (alternate) Sysprefs to enable the opening of OPAC cart in one click 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-21174-alternate-Sysprefs-to-enable-the-opening-vGL1MP.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org 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/