https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28180
Jonathan Druart <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Signed Off --- Comment #32 from Jonathan Druart <[email protected]> --- (In reply to Katrin Fischer from comment #31) > Can you please fix the conflicts? > CONFLICT (content): Merge conflict in > koha-tmpl/opac-tmpl/bootstrap/css/opac.css > CONFLICT (content): Merge conflict in > koha-tmpl/opac-tmpl/bootstrap/css/opac-rtl.css Those are conflicts on the "Compiled CSS patch". The patch can be skipped and the patch regenerated with "yarn build && yarn build --view=opac" -- 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/
