]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
projects / thirdparty / lxc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b00196 d720fa1)
Merge pull request #1463 from armchair-philosophy/up_templates_arch
authorStéphane Graber <stgraber@stgraber.org>
Wed, 15 Mar 2017 00:47:21 +0000 (20:47 -0400)
committerGitHub <noreply@github.com>
Wed, 15 Mar 2017 00:47:21 +0000 (20:47 -0400)
[templates] archlinux: resolve conflicting files


Trivial merge
Mirror of https://github.com/lxc/lxc.git