From: Adam A.G. Shamblin <adam.shamblin@gmail.com>
Date: Wed, 6 Sep 2017 03:46:14 +0000 (-0600)
Subject: Fix merge conflicts.
X-Git-Url: https://git.vexinglabs.com/?a=commitdiff_plain;h=87081e7d57e4076749cfbbc75e3a0438260269ad;p=resume.git

Fix merge conflicts.
---

87081e7d57e4076749cfbbc75e3a0438260269ad