https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12528
Marc Véron <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #57 from Marc Véron <[email protected]> --- Does not apply: Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref Auto-merging installer/data/mysql/sysprefs.sql Applying: Bug 12528 - fix problem when insert OPACEnhancedMessagingPreferences Applying: Bug 12528: Bug 9254: Followup - Rename pref to EnhancedMessagingPreferencesOPAC fatal: sha1 information is lacking or useless (installer/data/mysql/sysprefs.sql). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 12528: Bug 9254: Followup - Rename pref to EnhancedMessagingPreferencesOPAC -- 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/
