https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16424 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #4 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/css/staff-global.css Ere, changes to .css should not be committed to avoid such conflicts. It may be better to have a step to the test plan to remind testers to regenerate it. If you want it to be testable in a sandbox you can provide the css changes on a separate patch (to ease rebase and QA) -- You are receiving this mail because: You are watching all bug changes.