[Koha-bugs] [Bug 7180] Order from staged file improvements

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

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

mathieu saby <mathieu.saby at univ-rennes2.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |mathieu.saby at univ-rennes2.f
                   |                            |r

--- Comment #2 from mathieu saby <mathieu.saby at univ-rennes2.fr> ---
Hello
I tried to test your patch but it does not apply :
Applying: Bug 7180: Order from staged file improvements
Using index info to reconstruct a base tree...
<stdin>:357: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
error: The following untracked working tree files would be overwritten by
merge:
    acqui/ajax-getauthvaluedropbox.pl
Please move or remove them before you can merge.
Aborting
Failed to merge in the changes.
Patch failed at 0001 Bug 7180: Order from staged file improvements


M. Saby

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