https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20898
Katrin Fischer <katrin.fisc...@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |katrin.fisc...@bsz-bw.de Status|Signed Off |Patch doesn't apply --- Comment #7 from Katrin Fischer <katrin.fisc...@bsz-bw.de> --- Hi Owen, can you please provide a rebased patch? Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 20898 - Replace OPAC detail's results browser with non-JavaScript version Using index info to reconstruct a base tree... A koha-tmpl/opac-tmpl/bootstrap/less/opac.less A koha-tmpl/opac-tmpl/bootstrap/less/responsive.less Falling back to patching base and 3-way merge... CONFLICT (modify/delete): koha-tmpl/opac-tmpl/bootstrap/less/opac.less deleted in HEAD and modified in Bug 20898 - Replace OPAC detail's results browser with non-JavaScript version. Version Bug 20898 - Replace OPAC detail's results browser with non-JavaScript version of koha-tmpl/opac-tmpl/bootstrap/less/opac.less left in tree. Auto-merging koha-tmpl/opac-tmpl/bootstrap/css/src/_responsive.scss CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/css/src/_responsive.scss error: Failed to merge in the changes. Patch failed at 0001 Bug 20898 - Replace OPAC detail's results browser with non-JavaScript version Use 'git am --show-current-patch' to see the failed 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-20898---Replace-OPAC-details-results-browser-w-3X0gZy.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/