Removed leftover git conflict indicators
authorLaury GvR <laury@gaslightmedia.com>
Thu, 13 Apr 2017 13:49:11 +0000 (09:49 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 13 Apr 2017 13:49:11 +0000 (09:49 -0400)
commit52a8ec3b11d41b456478931c8f1e175d802cac74
tree7176cd36f8074239c0d303a7c548460524a8e8e2
parent5831363202146d55ba098f1fae82dae3aafd74f3
Removed leftover git conflict indicators
glm-member-db/views/front/members/detail.html