[Koha-bugs] [Bug 10758] Show bibliographic information of deleted records in acquisitions
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Wed Aug 6 10:41:33 CEST 2014
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10758
Paola Rossi <paola.rossi at cineca.it> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
--- Comment #49 from Paola Rossi <paola.rossi at cineca.it> ---
I've tried to apply the patches against master 3.17.00.011.
Applying: Bug 10758 - Show bibliographic information of deleted records in
acquisitions
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging acqui/neworderempty.pl
Auto-merging acqui/basket.pl
Auto-merging C4/Biblio.pm
CONFLICT (content): Merge conflict in C4/Biblio.pm
Auto-merging C4/Acquisition.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 10758 - Show bibliographic information of deleted
records in acquisitions
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
So I pass the patch to "Patch doesn't apply" status.
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list