http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5079
--- Comment #24 from Elliott Davis <tda...@uttyler.edu> 2011-10-22 17:22:09 UTC --- Paul_p: For the whitespace issue have you considered using "git merge -s recursive -Xignore-space-change" As for the change of sysprefs I'm assuming this file was moved from the mandatory folder. I can patch this but I am currently working on bug 5549 so all of my work is based on that. When it gets pushed to master I will continue my work on this bug. -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact 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/