http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9254
--- Comment #20 from Koha Team AMU <[email protected]> --- We wanted to test this patch but it doesn't apply on a sandbox : "Applying: Bug 9254: Problem with EnhancedMessagingPreferences\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging C4/Auth.pm Auto-merging installer/data/mysql/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.sql Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl\nFailed to merge in the changes.\nPatch failed at 0001 Bug 9254: Problem with EnhancedMessagingPreferences\nWhen you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort".\nBug 9254 - Problem with EnhancedMessagingPreferences" -- 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/
