[Koha-bugs] [Bug 11211] Move calculation code out of C4::Calendar

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

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

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply
                 CC|                            |katrin.fischer at bsz-bw.de

--- Comment #17 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
This patch no longer applies :(
I'd love to see this moving, please rebase quickly!

Bug 11211 - Move calculation code out of C4::Calendar

32110 - Bug 11211 - Move calculation code out of C4::Calendar

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 11211 - Move calculation code out of C4::Calendar
Using index info to reconstruct a base tree...
M    C4/Circulation.pm
M    C4/Installer/PerlDependencies.pm
M    Koha/Calendar.pm
M    t/db_dependent/Holidays.t
Falling back to patching base and 3-way merge...
Removing tools/newHolidays.pl
Removing tools/holidays.pl
Removing tools/exceptionHolidays.pl
Removing tools/copy-holidays.pl
Auto-merging t/db_dependent/Holidays.t
CONFLICT (content): Merge conflict in t/db_dependent/Holidays.t
Removing koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
Auto-merging Koha/Calendar.pm
CONFLICT (content): Merge conflict in Koha/Calendar.pm
Auto-merging C4/Installer/PerlDependencies.pm
CONFLICT (content): Merge conflict in C4/Installer/PerlDependencies.pm
Auto-merging C4/Circulation.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 11211 - Move calculation code out of C4::Calendar
The copy of the patch that failed is found in:
   /home/katrin/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-11211---Move-calculation-code-out-of-C4Calenda-4wLOOf.patch

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