http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8773
I'm just a bot <git...@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |git...@bugs.koha-community. | |org When did the bot| |2013-09-29 last check this| | --- Comment #36 from I'm just a bot <git...@bugs.koha-community.org> --- Applying: Bug 8773 - Start per-instance koha-index-daemon in .deb setup Using index info to reconstruct a base tree... M debian/koha-common.init M debian/koha-common.install M debian/scripts/koha-create Falling back to patching base and 3-way merge... Auto-merging debian/scripts/koha-create Auto-merging debian/koha-common.install Auto-merging debian/koha-common.init CONFLICT (content): Merge conflict in debian/koha-common.init Auto-merging debian/koha-common.default CONFLICT (add/add): Merge conflict in debian/koha-common.default Patch failed at 0001 Bug 8773 - Start per-instance koha-index-daemon in .deb setup The copy of the patch that failed is found in: /home/christopher/git/koha/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". -- 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/