log

Host: Linux davos 4.4.31 x86_64 Intel(R) Xeon(R) CPU E5-2603 v2 @ 1.80GHz
Image: eugeneia/snabb-nfv-test-vanilla
Pull Request: #1368
Target Head: 771b55c829f42a1a788002c2924c6d7047cd1568
Pull Request Head: f2bd95dcd8462063ff9d1b6209144d01197d9a81
SNABB_PCI0=0000:03:00.0 Ethernet controller: Intel Corporation 82599ES 10-Gigabit SFI/SFP+ Network Connection (rev 01)
SNABB_PCI1=0000:03:00.1 Ethernet controller: Intel Corporation 82599ES 10-Gigabit SFI/SFP+ Network Connection (rev 01)
SNABB_PCI_INTEL0=0000:03:00.0 Ethernet controller: Intel Corporation 82599ES 10-Gigabit SFI/SFP+ Network Connection (rev 01)
SNABB_PCI_INTEL1=0000:03:00.1 Ethernet controller: Intel Corporation 82599ES 10-Gigabit SFI/SFP+ Network Connection (rev 01)
SNABB_PCI_INTEL1G0=0000:01:00.0 Ethernet controller: Intel Corporation I350 Gigabit Network Connection (rev 01)
SNABB_PCI_INTEL1G1=0000:01:00.1 Ethernet controller: Intel Corporation I350 Gigabit Network Connection (rev 01)

ERROR: Failed to build 1368
From https://github.com/SnabbCo/snabb
 * [new ref]         refs/pull/1368/head -> pr1368
Switched to branch 'pr1368'
error: merge 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 pr1368
Unmerged paths:
  (use "git reset HEAD <file>..." to unstage)
  (use "git rm <file>..." to mark resolution)

	both deleted:    src/lib/yang/data.lua

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