http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14969
--- Comment #20 from Marc Véron <ve...@veron.ch> --- Jonathan, I wanted to sign-off on top of 15167 15168 15171 but patch does not apply: 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 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/
