[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

Magnus Enger <magnus at enger.priv.no> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #31 from Magnus Enger <magnus at enger.priv.no> ---
I get conflicts now:

$ git bz apply 11211
Bug 11211 - Move calculation code out of C4::Calendar

32978 - Bug 11211 - Move calculation code out of C4::Calendar
32992 - Bug 11211 [QA Followup] - Remove use of dt_add_type_uk_date

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...
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 misc/cronjobs/staticfines.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
CONFLICT (modify/delete):
koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt deleted in Bug 11211
- Move calculation code out of C4::Calendar and modified in HEAD. Version HEAD
of koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt left in tree.
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
Auto-merging Koha/Calendar.pm
Auto-merging C4/Overdues.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
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-SuvqdA.patch

The first one is probably caused by bug 13289:
http://git.koha-community.org/gitweb/?p=koha.git;a=commit;h=c474b0f645fecb2c1663907904c6b9aa583e4513

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