[Koha-bugs] [Bug 20123] Allow multiple instances of Koha to have different timezones on the same server

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

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20123

Dilan Johnpullé <dilan at calyx.net.au> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |dilan at calyx.net.au

--- Comment #6 from Dilan Johnpullé <dilan at calyx.net.au> ---
I'm having some trouble applying this patch in my devbox. My terminal output is
as follows:

vagrant at kohadevbox:kohaclone((673a40d...))$ git bz apply -s 20123
Bug 20123 - Allow multiple instances of Koha to have different timezones on the
same server

71840 - Bug 20123: Allow multiple instances of Koha to have different timezones
on the same server

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 20123: Allow multiple instances of Koha to have different
timezones on the same server
Using index info to reconstruct a base tree...
M       Koha/Database.pm
Falling back to patching base and 3-way merge...
Auto-merging Koha/Database.pm
CONFLICT (content): Merge conflict in Koha/Database.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 20123: Allow multiple instances of Koha to have
different timezones on the same server
The copy of the patch that failed is found in:
   /home/vagrant/kohaclone/.git/rebase-apply/patch
When 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".
Patch left in
/tmp/Bug-20123-Allow-multiple-instances-of-Koha-to-have-x5v_At.patch

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