[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

--- Comment #10 from Dilan Johnpullé <dilan at calyx.net.au> ---
Hi Kyle I'm still running into errors when applying the new patch. Looks like
whitespace. Terminal output 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

72081 - 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...
<stdin>:88: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
error: The following untracked working tree files would be overwritten by
merge:
        t/timezones.t
Please move or remove them before you can merge.
Aborting
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-AyegrT.patch

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