http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7674
--- Comment #16 from delaye <stephane.del...@biblibre.com> --- i have this message when i want to test in a sandbox(biblibre) CONFLICT (content): Merge conflict in catalogue/detail.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt -- 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/
