update for conflic in setup.phtml
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Jul 2014 20:32:11 +0000 (16:32 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Jul 2014 20:32:11 +0000 (16:32 -0400)
commitdea607becafac1213f0f058955257e4e06d69f07
tree8ef539535f1b57dfce13d84000370f4780cee49e
parent21e44c5ace1015420eeb8c66b47f422f38e3f8b8
parent64169af64e5e0bd384572aeb75e1720b1c94f364
update for conflic in setup.phtml
setup.phtml