http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10013
I'm just a bot <git...@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |git...@bugs.koha-community. | |org When did the bot| |2013-10-30 last check this| | --- Comment #24 from I'm just a bot <git...@bugs.koha-community.org> --- Applying: Bug 10013 - Ability to link directly from an item in the Staff client to budget information. Using index info to reconstruct a base tree... M C4/Acquisition.pm M catalogue/detail.pl M koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt Auto-merging catalogue/detail.pl Auto-merging C4/Acquisition.pm CONFLICT (content): Merge conflict in C4/Acquisition.pm Patch failed at 0001 Bug 10013 - Ability to link directly from an item in the Staff client to budget information. 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 Koha-bugs@lists.koha-community.org 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/