[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

Frederic Durand <frederic.durand at unilim.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |frederic.durand at unilim.fr

--- Comment #10 from Frederic Durand <frederic.durand at unilim.fr> ---
Applying: Bug 8307: Set a value for subfields when receiving
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging installer/data/mysql/sysprefs.sql
CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.sql
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 8307: Set a value for subfields when receiving
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 8307 - Set a value for items when receiving

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