http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5685 Marc Véron <veron@veron.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |veron@veron.ch --- Comment #12 from Marc Véron <veron@veron.ch> --- DOes not apply Applying: Bug 5685: Validation of email address field Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging opac/opac-memberentry.pl Auto-merging members/memberentry.pl CONFLICT (content): Merge conflict in members/memberentry.pl Auto-merging koha-tmpl/opac-tmpl/bootstrap/less/opac.less CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/less/opac.less Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt Failed to merge in the changes. Patch failed at 0001 Bug 5685: Validation of email address field -- You are receiving this mail because: You are watching all bug changes. You are the QA Contact for the bug.