https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=33668

--- Comment #40 from Andreas Roussos <[email protected]> ---
(In reply to Lucas Gass (lukeg) from comment #30)
> Tiny merge conflict in opac.scss needs to be resolved.
Apologies for the noise, I somehow managed to attach only my two
corrected patches with git-bz earlier, and this messed up the
patch order.

The merge conflict has now been resolved and all 7 patches apply
without problems on the current main branch (currently at commit
78c4bc89b1).

-- 
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/

Reply via email to