https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28180
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #31 from Katrin Fischer <[email protected]> --- Can you please fix the conflicts? Using index info to reconstruct a base tree... M koha-tmpl/opac-tmpl/bootstrap/css/opac-rtl.css 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 Auto-merging koha-tmpl/opac-tmpl/bootstrap/css/opac-rtl.css CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/css/opac-rtl.css error: Failed to merge in the changes. Patch failed at 0001 Bug 28180: CSS changes 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". -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
