[Koha-bugs] [Bug 7677] New area in subscriptions and new function when receiving

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

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

Koha Team Lyon 3 <koha at univ-lyon3.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #69 from Koha Team Lyon 3 <koha at univ-lyon3.fr> ---
tried on a sandbox :
<h1>Something went wrong !</h1>Applying: BZ7677: New areas in subscriptions and
new functions when receiving.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging serials/subscription-add.pl CONFLICT (content): Merge conflict in
serials/subscription-add.pl Auto-merging serials/serials-edit.pl Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/sysprefs.sql Auto-merging
installer/data/mysql/kohastructure.sql
CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql
Auto-merging C4/Serials.pm
Failed to merge in the changes.
Patch failed at 0001 BZ7677: New areas in subscriptions and new functions when
receiving.

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