From: copycat-killer <dada@archlinux.info>
Date: Mon, 9 May 2016 17:02:49 +0000 (+0200)
Subject: adds #196 solving conflicts; closes #191
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/be725b3ecff60f77dc800f38cab340df494b82eb?ds=inline;hp=be725b3ecff60f77dc800f38cab340df494b82eb

adds #196 solving conflicts; closes #191
---