[Koha-bugs] [Bug 12137] Extend CalendarFirstDayOfWeek to be any day

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12137

Indranil Das Gupta <indradg at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |indradg at gmail.com
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #8 from Indranil Das Gupta <indradg at gmail.com> ---
(In reply to M. Tompsett from comment #7)

Applying: Bug 12137 - Extend CalendarFirstDayOfWeek to be any day
Using index info to reconstruct a base tree...
M    C4/Auth.pm
M    installer/data/mysql/sysprefs.sql
M    installer/data/mysql/updatedatabase.pl
M    koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/sysprefs.sql
Auto-merging C4/Auth.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 12137 - Extend CalendarFirstDayOfWeek to be any day

-- 
You are receiving this mail because:
You are watching all bug changes.