http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11211
Owen Leonard <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #14 from Owen Leonard <[email protected]> --- 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 CONFLICT (modify/delete): tools/holidays.pl deleted in Bug 11211 - Move calculation code out of C4::Calendar and modified in HEAD. Version HEAD of tools/holidays.pl left in tree. Removing tools/exceptionHolidays.pl Removing tools/copy-holidays.pl Removing koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt Auto-merging C4/Overdues.pm Auto-merging 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 -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
