projects / WP-Themes / brewbakers.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 37ea1d1) | patch
fixing merge conflict
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 14 Apr 2017 14:49:19 +0000 (10:49 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 14 Apr 2017 14:49:19 +0000 (10:49 -0400)
commitacfabdcb0b0632fbe693a09c71b5bdad77124e07
tree63e5141bb6c12883957ca098c2d5d8c3972a1c32tree | snapshot
parent37ea1d1b2b0164d2c639ffebe00691a4e73cee2bcommit | diff
fixing merge conflict

replacing Laury's original merge where he removed the js statement that moved
the sale price next to the msrp price in list view theme file
glm-member-db/views/front/members/list.html diff | blob | history