[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

Kristina <khspaces-subscriptions at yahoo.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |khspaces-subscriptions at yaho
                   |                            |o.de

--- Comment #2 from Kristina <khspaces-subscriptions at yahoo.de> ---
I tested this patch on the BibLibre sandbox
http://pro.test8.biblibre.com/cgi-bin/koha/sandbox.pl

and received the following conflict message:

<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/>
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref<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/>

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