https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11299 --- Comment #25 from M. Tompsett <mtompset@hotmail.com> --- The addbiblio.tt conflict is easy enough to resolve, though you need to look into fontawesome classes instead of icon-ok. The C4/Biblio.pm conflict is harder to resolve, as the logic which is ripped out and replaced with a function has changed. This means the logic in the new function needed to be rechecked. Please rebase. -- You are receiving this mail because: You are watching all bug changes.