http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6030
Katrin Fischer <katrin.fisc...@bsz-bw.de> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
--- Comment #12 from Katrin Fischer <katrin.fisc...@bsz-bw.de> 2012-01-15
20:06:29 UTC ---
Follow up does not apply:
[~/kohaclone (6030_htmloverdues)⚡]> git am -iu3
/tmp/proposed-patch-follow-up-jH3H5e.patch
Commit Body is:
--------------------------
Bug 6030 follow-up
Fixing problem detected previously:
* add column_def retrieval, to have header displaying the "explained" row name,
not the table name. (the name is not expanded for CSV exports)
* removed some warnings.
* fixed some problems with csvfilename being defined/empty. Now, csvfilename is
always defined, and set to '' by default. Some tests have been updated
accordingly
* added the charset=UTF8 on mail headers.
This patch also adds some missing columns to columns.def
--------------------------
Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: Bug 6030 follow-up
fatal: sha1 information is lacking or useless
(misc/cronjobs/overdue_notices.pl).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 6030 follow-up
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"
--
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.
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/
