[Koha-bugs] [Bug 10855] Additional fields for subscriptions
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Wed Oct 30 16:19:07 CET 2013
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10855
Paola Rossi <paola.rossi at cineca.it> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Failed QA
--- Comment #33 from Paola Rossi <paola.rossi at cineca.it> ---
against master 3.13.00.034:
Applying: Bug 10855: New fields on adding/updating a subscription
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging serials/subscription-detail.pl
Auto-merging serials/subscription-add.pl
CONFLICT (content): Merge conflict in serials/subscription-add.pl
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
Auto-merging C4/Serials.pm
CONFLICT (content): Merge conflict in C4/Serials.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 10855: New fields on adding/updating a subscription
So I pass tha patch to "Failed QA" status.
NB. Update database entry needs to be rebased too.
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list