https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15766
Owen Leonard <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #79843|0 |1 is obsolete| | Attachment #79844|0 |1 is obsolete| | --- Comment #47 from Owen Leonard <[email protected]> --- Created attachment 79845 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=79845&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. Signed-off-by: Owen Leonard <[email protected]> -- 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/
