Fixed merge conflicts
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 26 Nov 2018 17:06:43 +0000 (12:06 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 26 Nov 2018 17:38:09 +0000 (12:38 -0500)
commit8f76f66859973d440a5b17e878865d36ec99ac60
tree1a9ccf211ada9c06045315c40dc75366b57d9bd3
parente2fb66a68fb8f1d5ea9d1e435d053b8ca2add233
Fixed merge conflicts
readme.txt