https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11088 Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |bgkriegel@gmail.com --- Comment #8 from Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> --- There is a conflic after applying first patch, and again on second patch. CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt -- You are receiving this mail because: You are watching all bug changes.