http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8061 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |chris@bigballofwax.co.nz --- Comment #4 from Chris Cormack <chris@bigballofwax.co.nz> --- Hi Ruth Unfortunately the first patch no longer applies Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tt CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tt Auto-merging koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc Auto-merging koha-tmpl/opac-tmpl/prog/en/css/opac.css Failed to merge in the changes. Patch failed at 0001 Bug 8061: RTL CSS overrides (OPAC) The second one conflicts too Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc Failed to merge in the changes. -- You are receiving this mail because: You are watching all bug changes.