https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=2093 --- Comment #10 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 2093: Add OPAC Summary for logged-in users Applying: Bug 2093 [Follow-up] Add OPAC dashboard for logged-in users Applying: Bug 2093 [Compiled CSS] Add OPAC dashboard for logged-in users Using index info to reconstruct a base tree... 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 error: Failed to merge in the changes. Patch failed at 0001 Bug 2093 [Compiled CSS] Add OPAC dashboard for logged-in users 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". Patch left in /tmp/Bug-2093-Compiled-CSS-Add-OPAC-dashboard-for-logge-v0S97a.patch Can you please recompile the CSS? -- You are receiving this mail because: You are watching all bug changes.