Remove conflicts
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Jun 2019 13:59:21 +0000 (09:59 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Jun 2019 13:59:21 +0000 (09:59 -0400)
commit15cface0b09bf697ea9f0ce2d034a358236fcd52
treed90293802e2d0f0abd23cd7481893b58729e9f47
parente9ea6d92272f65fe50a0974e6f497a1fe1bbbf62
Remove conflicts

Removing Conflicts.
index.php
views/front/events/agenda_new.html