From: ken <ken@kengrimes.com>
Date: Wed, 12 Jul 2017 20:38:54 +0000 (+0000)
Subject: fixed merge conflicts
X-Git-Url: https://git.kengrimes.com/?p=henge%2Fkiak.git;a=commitdiff_plain;h=25a33ef76e7fbb1647fcbac0bd2c3b2cb84ca2d2;hp=25a33ef76e7fbb1647fcbac0bd2c3b2cb84ca2d2

fixed merge conflicts
---