log

Host: Linux snabbvirtbot 4.4.23 x86_64 Intel(R) Xeon(R) CPU E3-1246 v3 @ 3.50GHz
Image: eugeneia/snabb-nfv-test-vanilla
Pull Request: #973
Target Head: 4b0c18beb86223414fcdbf0dc9e9f5fa5aaa2179
Pull Request Head: 56eda3d8af9317005a92a8d138356eb2a6d970f1

ERROR: Failed to build 973
From https://github.com/SnabbCo/snabb
 * [new ref]         refs/pull/973/head -> pr973
Switched to branch 'pr973'
error: Merging is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
On branch pr973
Unmerged paths:
  (use "git reset HEAD <file>..." to unstage)
  (use "git rm <file>..." to mark resolution)

	both deleted:    .gitignore
	both deleted:    src/Makefile

Untracked files:
  (use "git add <file>..." to include in what will be committed)

	src/ndpi/
	src/program/lwaftr/tests/__pycache__/
	src/program/lwaftr/tests/subcommands/

no changes added to commit (use "git add" and/or "git commit -a")