https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15766
--- Comment #44 from Owen Leonard <oleon...@myacpl.org> --- Created attachment 79843 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=79843&action=edit Bug 15766: (follow-up) Correct merge errors This patch corrects some problems applying this on current master and removes an old merge conflict marker. -- 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/
