http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13575
Nicole C. Engard <neng...@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |neng...@gmail.com Status|Needs Signoff |Failed QA --- Comment #3 from Nicole C. Engard <neng...@gmail.com> --- I tried to apply this patch and got the following: Applying: Bug 13575 - Names do not appear in the Koha history Timeline. This would be a good addition. The names to be added are: Kahurangi Cormack, Alexander Cheeseman Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging docs/history.txt CONFLICT (content): Merge conflict in docs/history.txt Failed to merge in the changes. Patch failed at 0001 Bug 13575 - Names do not appear in the Koha history Timeline. This would be a good addition. The names to be added are: Kahurangi Cormack, Alexander Cheeseman 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/Bug-13575---Names-do-not-appear-in-the-Koha-histor-aJO7vj.patch koha@koha-vm:~/kohaclone$ Maybe you should add it to the official bug instead: bug 7143 -- You are receiving this mail because: 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/