http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15358 --- Comment #13 from Ian Palko <library@stas.org> --- I don't have a git setup yet, but a 3.22.0 package setup on a test server, so for what it's worth ... I have not updated yet to 3.22.1, but will do so tomorrow morning, so can try to test it then on the latest packages. I've manually edited the relevant files in accordance with Julian's patches here. It does seem to fix things back to merging, but probably more thorough test are certainly in order from those who actually are competent here. I'm just a librarian and armchair hacker ... If all works tomorrow when I test on the latest packages, I'll signoff. If anyone is able to test before then, I'm more than happy to let them do it. -- You are receiving this mail because: You are watching all bug changes.