[Koha-bugs] [Bug 7595] Add branchcode to accountlines

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

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

cedric.vita at dracenie.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |cedric.vita at dracenie.com

--- Comment #16 from cedric.vita at dracenie.com ---
Something went wrong !
Applying: Bug 7595 - Add branchcode to accountlines
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging C4/Accounts.pm
CONFLICT (content): Merge conflict in C4/Accounts.pm
Auto-merging installer/data/mysql/kohastructure.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 7595 - Add branchcode to accountlines
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 7595 - Add branchcode to accountlines

[SIGNED-OFF] Bug 7595 - Add branchcode to accountlines
Apply? [yn]
Patch left in
/tmp/SIGNED-OFF-Bug-7595---Add-branchcode-to-accountlin-ViMI8t.patch

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