https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7534
--- Comment #14 from Lari Taskula <lari.task...@jns.fi> --- (In reply to Chris Kirby from comment #12) > Applying patches, failed to merge changes for > "Bug 7534: Display pickup locations instead of all libraries in > opac-reserve.pl" > > Failed to merge in changes. Thanks for reporting! I fixed the conflict as promised yesterday in IRC. Does it apply now? -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug. _______________________________________________ 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/