[Koha-bugs] [Bug 15869] change framework on overlay

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

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

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

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #3 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Sorry, patch no longer applies. Please rebase:

55543 - Bug 15869 - change framework on overlay

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 15869 - change framework on overlay
.git/rebase-apply/patch:17: trailing whitespace.
    # optional callback to monitor status 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M       C4/ImportBatch.pm
M       koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
M       tools/manage-marc-import.pl
.git/rebase-apply/patch:17: trailing whitespace.
    # optional callback to monitor status 
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging tools/manage-marc-import.pl
CONFLICT (content): Merge conflict in tools/manage-marc-import.pl
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
Auto-merging C4/ImportBatch.pm
CONFLICT (content): Merge conflict in C4/ImportBatch.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 15869 - change framework on overlay
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-15869---change-framework-on-overlay-K6lG8D.patch

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