http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8845 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply CC| |katrin.fischer@bsz-bw.de --- Comment #18 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Bug 8845: Followup Allow to give a date using the syspref format Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -------------------------- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Bug 8845: Followup Allow to give a date using the syspref format Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging members/member.pl CONFLICT (content): Merge conflict in members/member.pl Failed to merge in the changes. Patch failed at 0001 Bug 8845: Followup Allow to give a date using the syspref format 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". -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.