http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14969
--- Comment #22 from Marc Véron <[email protected]> --- Jonathan, on top of 15166 15167 15168 15171 I get still: Auto-merging serials/checkexpiration.pl CONFLICT (content): Merge conflict in serials/checkexpiration.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt I is related to checkexpiration -- 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/
