Fix conflict markers
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Jun 2019 13:50:15 +0000 (09:50 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Jun 2019 13:50:15 +0000 (09:50 -0400)
commit9df2d5224378e82c678b230a55572fcf581f4386
treed2733ef31ea00af5f3a106819949669ff15b2102
parentca746f3703d3905d0c1440e7385b4765ee2d2846
Fix conflict markers

remove conflict markers
views/front/events/agenda_new.html