]> git.proxmox.com Git - mirror_lxc.git/commitdiff
Merge pull request #1596 from brauner/2017-05-29/fix_parsing
authorSerge Hallyn <serge@hallyn.com>
Thu, 1 Jun 2017 21:17:11 +0000 (16:17 -0500)
committerGitHub <noreply@github.com>
Thu, 1 Jun 2017 21:17:11 +0000 (16:17 -0500)
confile: fix parsing

1  2 
src/lxc/conf.c

diff --cc src/lxc/conf.c
Simple merge