https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=40853 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |fridolin.somers@biblibre.co | |m --- Comment #21 from Fridolin Somers <fridolin.somers@biblibre.com> --- diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql index d321bf1213..13faac930f 100644 --- a/installer/data/mysql/mandatory/sysprefs.sql +++ b/installer/data/mysql/mandatory/sysprefs.sql @@ -1,3 +1,4 @@ +<<<<<<< HEAD Ouf :D this error was patched in main by commit : 852a8b802f1 Bug 40853: (RM follow-up) Fix re-base error -- You are receiving this mail because: You are watching all bug changes.