Created attachment 3141 [details] [review] Proposed Patch
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
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@debian:~/kohaclone$
*** This bug has been marked as a duplicate of bug 5728 ***