[Koha-bugs] [Bug 7957] Routing lists: manage several routing list for each subscription, and export them as CSV

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7957

Corinne BULAC <corinnebulac at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |corinnebulac at gmail.com

--- Comment #11 from Corinne BULAC <corinnebulac at gmail.com> ---
Something went wrong !
Applying: Bug 7957: Routing lists enhancements
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging C4/Items.pm
Auto-merging C4/Serials.pm
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
Removing koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt
CONFLICT (delete/modify):
koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt deleted in Bug 7957:
Routing lists enhancements and modified in HEAD. Version HEAD of
koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt left in tree.
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
Removing serials/reorder_members.pl
Removing serials/routing-preview.pl
Removing serials/routing.pl
Auto-merging serials/serials-collection.pl
Auto-merging serials/serials-search.pl
Auto-merging serials/subscription-detail.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 7957: Routing lists enhancements
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".
Bug 7957 - Routing lists: manage several routing list for each subscription,
and export them as CSV

Bug 7957: Routing lists enhancements
Apply? [yn] 
Patch left in /tmp/Bug-7957-Routing-lists-enhancements-8Hq0be.patch

-- 
You are receiving this mail because:
You are watching all bug changes.