https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=41682
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #3 from David Nind <[email protected]> --- The second patch doesn't apply for me: git bz apply 41682 Bug 41682 - Syspref discrepancies between new and upgraded installs 191858 - Bug 41682: Add tests 191859 - Bug 41682: Sync DB and sysprefs.sql for new and upgraded installs Apply? [(y)es, (n)o, (i)nteractive] i Applying: Bug 41682: Sync DB and sysprefs.sql for new and upgraded installs Using index info to reconstruct a base tree... M installer/data/mysql/mandatory/sysprefs.sql Falling back to patching base and 3-way merge... Auto-merging installer/data/mysql/mandatory/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/mandatory/sysprefs.sql error: Failed to merge in the changes. Patch failed at 0001 Bug 41682: Sync DB and sysprefs.sql for new and upgraded installs -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://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/
