https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13757
--- Comment #21 from Marc Véron <ve...@veron.ch> --- Patch does not apply: Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt Auto-merging koha-tmpl/intranet-tmpl/prog/css/staff-global.css Auto-merging installer/data/mysql/kohastructure.sql CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql Auto-merging admin/patron-attr-types.pl Auto-merging C4/Members/AttributeTypes.pm CONFLICT (content): Merge conflict in C4/Members/AttributeTypes.pm Failed to merge in the changes. -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org 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/
