http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6858 claire.hernandez@biblibre.com <claire.hernandez@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch Status|Needs Signoff |Does not apply --- Comment #5 from claire.hernandez@biblibre.com <claire.hernandez@biblibre.com> 2011-12-02 13:47:13 UTC --- $ git bz apply 6858 Bug 6858 - Adds staticfines.pl for static fines processing Bug 6858: Adds staticfines.pl for static fines processing Apply? [yn] y Applying: Bug 6858: Adds staticfines.pl for static fines processing /home/claire/dev/community_repo/koha/.git/rebase-apply/patch:175: trailing whitespace. error: misc/cronjobs/staticfines.pl: already exists in index Patch failed at 0001 Bug 6858: Adds staticfines.pl for static fines processing 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". Patch left in /tmp/Bug-6858-Adds-staticfinespl-for-static-fines-proce-LGi2ve.patch -- 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.