[Koha-bugs] [Bug 5263] Add support for including fields from the ISSUES table in advanced due notices

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

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

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 Nicole C. Engard <nengard at gmail.com> 2011-03-08 00:28:48 UTC ---
Does not apply:


Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: Bug 5263 - Add support for including fields from the ISSUES table in
advanced due notices
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging C4/Letters.pm
CONFLICT (content): Merge conflict in C4/Letters.pm
Auto-merging tools/letter.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 5263 - Add support for including fields from the
ISSUES table in advanced due notices
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.