[Koha-bugs] [Bug 10789] Excessive and often incorrect use of finish in C4::Acquisitions
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Thu Oct 24 21:37:58 CEST 2013
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10789
I'm just a bot <gitbot at bugs.koha-community.org> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
When did the bot|2013-09-29 00:00:00 |2013-10-25
last check this| |
--- Comment #3 from I'm just a bot <gitbot at bugs.koha-community.org> ---
Applying: Bug 10789 Remove unnecessary calls to finish in C4::Acquisitions
Using index info to reconstruct a base tree...
M C4/Acquisition.pm
Falling back to patching base and 3-way merge...
Auto-merging C4/Acquisition.pm
CONFLICT (content): Merge conflict in C4/Acquisition.pm
Patch failed at 0001 Bug 10789 Remove unnecessary calls to finish in
C4::Acquisitions
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.
More information about the Koha-bugs
mailing list