From: Stéphane Graber <stgraber@stgraber.org>
Date: Wed, 15 Mar 2017 00:47:21 +0000 (-0400)
Subject: Merge pull request #1463 from armchair-philosophy/up_templates_arch
X-Git-Tag: lxc-2.1.0~180
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb2f4389850bb7f08728c4ce13a4b767e86857dd;p=thirdparty%2Flxc.git

Merge pull request #1463 from armchair-philosophy/up_templates_arch

[templates] archlinux: resolve conflicting files
---

bb2f4389850bb7f08728c4ce13a4b767e86857dd