http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10875
I'm just a bot <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply When did the bot|2013-09-29 00:00:00 |2013-10-27 last check this| | --- Comment #8 from I'm just a bot <[email protected]> --- Applying: Bug 7180: Add UT for C4::Budgets::GetBudgetByCode Using index info to reconstruct a base tree... M t/db_dependent/Budgets.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Budgets.t CONFLICT (content): Merge conflict in t/db_dependent/Budgets.t Patch failed at 0001 Bug 7180: Add UT for C4::Budgets::GetBudgetByCode The copy of the patch that failed is found in: /home/christopher/git/koha/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". -- 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/
