19 Apr
2021
19 Apr
'21
9:58 a.m.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=27631 --- Comment #30 from wainuiwitikapark@catalyst.net.nz --- (In reply to Séverine Queune from comment #16)
I just had this conflict applying patch on master :
CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt Auto-merging koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss error: Failed to merge in the changes. Patch failed at 0001 Bug 27631: Changed <h1> around logo to <div>
thanks so much for pointing this out! I have now fixed merge conflicts and re-attached patches -- You are receiving this mail because: You are watching all bug changes.