http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11867
Olli-Antti Kivilahti <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #2 from Olli-Antti Kivilahti <[email protected]> --- -- Merge issues: -- --------------------- git pull git bz apply [9016 10832 10833 10845 11208] So far so good! So then we get the merge error :( http://pastebin.com/PrxXt4t4 -- 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/
