https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26189 Sally <sally.healey@cheshiresharedservices.gov.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #8 from Sally <sally.healey@cheshiresharedservices.gov.uk> --- I received a conflict when trying to apply the patch: Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 26189: Improve styling of datatables within fieldsets -- You are receiving this mail because: You are watching all bug changes.