]> Vexing Labs - resume.git/commitdiff
Fix merge conflicts.
authorAdam A.G. Shamblin <adam.shamblin@gmail.com>
Wed, 6 Sep 2017 03:46:14 +0000 (21:46 -0600)
committerAdam A.G. Shamblin <adam.shamblin@gmail.com>
Wed, 6 Sep 2017 03:46:14 +0000 (21:46 -0600)

Trivial merge