http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12017 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |chris@bigballofwax.co.nz --- Comment #16 from Chris Cormack <chris@bigballofwax.co.nz> --- Falling back to patching base and 3-way merge... Auto-merging opac/opac-search.pl CONFLICT (content): Merge conflict in opac/opac-search.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc Auto-merging catalogue/search.pl CONFLICT (content): Merge conflict in catalogue/search.pl Auto-merging C4/Languages.pm Failed to merge in the changes. -- You are receiving this mail because: You are watching all bug changes.