http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11699
--- Comment #10 from Nicole C. Engard <[email protected]> --- What did I do wrong? nengard@kohavm:~/kohaclone$ git bz apply 11699 Bug 11699 - notes entered when receiving are not saved 25900 - [SIGNED OFF] Bug 11699: Notes entered when receiving are not saved 25901 - [SIGNED OFF] Bug 11699: ModReceiveOrder should take a hashref in parameter Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 11699: Notes entered when receiving are not saved Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Acquisition.pm Auto-merging t/db_dependent/Acquisition.t CONFLICT (content): Merge conflict in t/db_dependent/Acquisition.t Failed to merge in the changes. Patch failed at 0001 Bug 11699: Notes entered when receiving are not saved When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/SIGNED-OFF-Bug-11699-Notes-entered-when-receiving--I7IJ4M.patch nengard@kohavm:~/kohaclone$ -- 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/
