[Koha-bugs] [Bug 9014] Add time due to slips

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

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

cedric.vita at dracenie.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |cedric.vita at dracenie.com

--- Comment #31 from cedric.vita at dracenie.com ---
Something went wrong !
Applying: Bug 9014 - Add time due to slips
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging C4/Letters.pm
CONFLICT (content): Merge conflict in C4/Letters.pm
Auto-merging C4/Members.pm
Auto-merging acqui/lateorders.pl
Auto-merging installer/data/mysql/sysprefs.sql
CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.sql
Auto-merging installer/data/mysql/updatedatabase.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 9014 - Add time due to slips
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 9014 - Add time due to slips

Bug 9014 - Add time due to slips
Apply? [yn]
Patch left in /tmp/Bug-9014---Add-time-due-to-slips-Guckby.patch

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