http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7154
MathildeF <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |mathilde.formery@ville-nime | |s.fr --- Comment #19 from MathildeF <[email protected]> --- i cant test with sandbox CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt Auto-merging members/memberentry.pl Auto-merging members/moremember.pl Failed to merge in the changes. Patch failed at 0001 Bug 7154: Modification in borrower attributes -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
