http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10726
Bernardo Gonzalez Kriegel <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #11 from Bernardo Gonzalez Kriegel <[email protected]> --- Hi, some conflicts :( Auto-merging installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/framework_DEFAULT.sql CONFLICT (content): Merge conflict in installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/framework_DEFAULT.sql Auto-merging installer/data/mysql/en/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql CONFLICT (content): Merge conflict in installer/data/mysql/en/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql -- 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/
