projects / WP-Themes / meetingsmichigan.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a8abdf9) | patch
removing git conflict text
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 31 Oct 2017 15:14:46 +0000 (11:14 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 31 Oct 2017 15:14:46 +0000 (11:14 -0400)
commit06356d01205e1bd103da7d1bfd6289c2caddc4ac
tree3f084e1a6e6d4b24ca53cc9b696c97cb999ce9eftree | snapshot
parenta8abdf9cbf150caff74ef3d3a2a3c2460d4eb971commit | diff
removing git conflict text

removing the the git conflict text from files that had merge conflicts
glm-member-db/views/front/members/list.html diff | blob | history