[Koha-bugs] [Bug 23594] Batch modification for itemtypes on suggestions page

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

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

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

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply
                 CC|                            |katrin.fischer at bsz-bw.de

--- Comment #10 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Hi Jonathan, can you please rebase?

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 23594: Batch modification for itemtypes on suggestions page
.git/rebase-apply/patch:345: trailing whitespace.
}  
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
M       suggestion/suggestion.pl
.git/rebase-apply/patch:345: trailing whitespace.
}  
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging suggestion/suggestion.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
error: Failed to merge in the changes.
Patch failed at 0001 Bug 23594: Batch modification for itemtypes on suggestions
page
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-23594-Batch-modification-for-itemtypes-on-sugg-BKdhvf.patch

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