http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6019
Katrin Fischer <katrin.fisc...@bsz-bw.de> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |katrin.fisc...@bsz-bw.de
Patch Status|Needs Signoff |Does not apply
--- Comment #5 from Katrin Fischer <katrin.fisc...@bsz-bw.de> 2011-12-21
06:49:19 UTC ---
Second patch does not apply:
Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: Bug 6019 : Perf enhancement : C4/SQLHelper.pm
/home/katrin/kohaclone/.git/rebase-apply/patch:18: trailing whitespace.
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
<stdin>:18: trailing whitespace.
warning: 1 line applied after fixing whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging C4/SQLHelper.pm
CONFLICT (content): Merge conflict in C4/SQLHelper.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 6019 : Perf enhancement : C4/SQLHelper.pm
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/
