http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5877
--- Comment #52 from M. de Rooy <[email protected]> 2012-02-29 15:06:24 UTC --- After fixing the first, the third still gives: Applying: Bug 5877 QA follow-up error: patch failed: C4/Circulation.pm:3037 error: C4/Circulation.pm: patch does not apply error: patch failed: offline_circ/list.pl:41 error: offline_circ/list.pl: patch does not apply error: patch failed: offline_circ/service.pl:30 error: offline_circ/service.pl: patch does not apply Using index info to reconstruct a base tree... error: patch failed: C4/Circulation.pm:3037 error: C4/Circulation.pm: patch does not apply error: patch failed: offline_circ/list.pl:41 error: offline_circ/list.pl: patch does not apply error: patch failed: offline_circ/service.pl:30 error: offline_circ/service.pl: patch does not apply Did you hand edit your patch? It does not apply to blobs recorded in its index. Cannot fall back to three-way merge. -- 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 [email protected] 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/
