[Koha-bugs] [Bug 15774] Additional fields for baskets

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

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15774

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #115 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
I am sorry, but there are some conflicts. Please rebase, I'll try to come back
to this soon:

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 15774: Add additional fields to order baskets
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
M       koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
M       serials/serials-search.pl
M       serials/subscription-add.pl
Falling back to patching base and 3-way merge...
Auto-merging serials/subscription-add.pl
CONFLICT (content): Merge conflict in serials/subscription-add.pl
Auto-merging serials/serials-search.pl
CONFLICT (content): Merge conflict in serials/serials-search.pl
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
Removing koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
Auto-merging admin/additional-fields.pl
error: Failed to merge in the changes.
Patch failed at 0001 Bug 15774: Add additional fields to order baskets
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in
/tmp/Bug-15774-Add-additional-fields-to-order-baskets-LGaSot.patch

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