fixing conflick markers
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 5 Oct 2015 15:26:25 +0000 (11:26 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 5 Oct 2015 15:26:25 +0000 (11:26 -0400)
commitfbc83fee0d9a6ed8231637dbe758077308737641
treecd5c1f1f9dbfb8b497e4ee5f67868ede991080c4
parent91039f476936ae8a1f1972e1f2b1fa570dbbac5e
fixing conflick markers
home.php
scss/_structure.scss