[Koha-bugs] [Bug 8307] Set a value for items when receiving

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

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

Alexandre Lengereau <alexandre.lengereau at biblibre.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |alexandre.lengereau at biblibr
                   |                            |e.com

--- Comment #2 from Alexandre Lengereau <alexandre.lengereau at biblibre.com> ---
SandBox Test result:

<h1>Something went wrong !</h1>Applying: Bug 8307: Set a value for items when
ordering<br/>
Using index info to reconstruct a base tree...<br/>
Falling back to patching base and 3-way merge...<br/>
Auto-merging installer/data/mysql/sysprefs.sql<br/>
CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.sql<br/>
Auto-merging installer/data/mysql/updatedatabase.pl<br/>
CONFLICT (content): Merge conflict in
installer/data/mysql/updatedatabase.pl<br/>
Failed to merge in the changes.<br/>
Patch failed at 0001 Bug 8307: Set a value for items when ordering<br/>
When you have resolved this problem run git am --resolved.<br/>
If you would prefer to skip this patch, instead run git am --skip.<br/>
To restore the original branch and stop patching run git am --abort.<br/>
Bug 8307 - Set a value for items when receiving<br/>
<br/>
Bug 8307: Set a value for items when ordering<br/>
Apply? [yn] <br/>
Patch left in
/tmp/Bug-8307-Set-a-value-for-items-when-ordering-K_sCQB.patch<br/>
<br/>=== translation installation ===<br/>
If you use this system for the 1st time, you may find usefull to reach the wiki
page http://wiki.koha-community.org/wiki/Sandboxes to have some information
about those results, to check if everything went well & if you can test the
patch properly

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