[Koha-bugs] [Bug 5752] Add a notes row, and a manager_id to the accountlines table

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

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

Nicole C. Engard <nengard at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |nengard at gmail.com
       Patch Status|Needs Signoff               |Does not apply

--- Comment #2 from MJ Ray (software.coop) <mjr at ttllp.co.uk> 2011-03-03 08:37:06 UTC ---
This bug is mentioned in:
Bug 5752 : Add note and manager_id to    accountlines
http://lists.koha-community.org/pipermail/koha-patches/2011-February/013845.html

--- Comment #3 from Nicole C. Engard <nengard at gmail.com> 2011-03-07 19:38:47 UTC ---
Does not apply:




Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: Bug 5752 : Add note and manager_id to accountlines
Using index info to reconstruct a base tree...
<stdin>:29: trailing whitespace.
        ); 
<stdin>:263: trailing whitespace.
} 
warning: 2 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging kohaversion.pl
CONFLICT (content): Merge conflict in kohaversion.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 5752 : Add note and manager_id 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".
nengard at debian:~/kohaclone$

-- 
Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA Contact for the bug.