http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10781
M. de Rooy <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #2 from M. de Rooy <[email protected]> --- Applying: bug_10781: Removed ILSDI::Utility /usr/share/koha/testclone/.git/rebase-apply/patch:43: tab in indent. my ($biblionumber, $status, $msg, $location) = _availability($id); warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... <stdin>:43: tab in indent. my ($biblionumber, $status, $msg, $location) = _availability($id); warning: 1 line applied after fixing whitespace errors. Falling back to patching base and 3-way merge... Removing t/ILSDI_Utility.t CONFLICT (modify/delete): C4/ILSDI/Utility.pm deleted in bug_10781: Removed ILSDI::Utility and modified in HEAD. Version HEAD of C4/ILSDI/Utility.pm left in tree. Auto-merging C4/ILSDI/Services.pm CONFLICT (content): Merge conflict in C4/ILSDI/Services.pm Failed to merge in the changes. -- You are receiving this mail because: 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/
