Merge pull request #2099 from brauner/2018-01-20/attach_init_pty

author Stéphane Graber <stgraber@stgraber.org>

Wed, 24 Jan 2018 20:24:46 +0000 (22:24 +0200)

committer GitHub <noreply@github.com>

Wed, 24 Jan 2018 20:24:46 +0000 (22:24 +0200)
author Stéphane Graber <stgraber@stgraber.org>
Wed, 24 Jan 2018 20:24:46 +0000 (22:24 +0200)
committer GitHub <noreply@github.com>
Wed, 24 Jan 2018 20:24:46 +0000 (22:24 +0200)
diff --cc src/lxc/conf.c
Simple merge
diff --cc src/lxc/start.c
Simple merge
author	Stéphane Graber <stgraber@stgraber.org>
	Wed, 24 Jan 2018 20:24:46 +0000 (22:24 +0200)
committer	GitHub <noreply@github.com>
	Wed, 24 Jan 2018 20:24:46 +0000 (22:24 +0200)
		1	2
src/lxc/conf.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lxc/start.c	patch \|	diff1 \|	diff2 \|	blob \| history