[Koha-bugs] [Bug 5354] Partial duplication of a subscription

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

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

--- Comment #8 from Kristina Hoeppner <kristina at catalyst.net.nz> ---
Sorry, Jonathan. I had a merge conflict again. :-(

<h1>Something went wrong !</h1>Applying: Bug 5354: Partial duplication of a
subscription<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/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 5354: Partial duplication of a subscription<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 5354 - Partial duplication of a subscription<br/>
<br/>

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
You are watching all bug changes.