fixed merge errors
authorIan Weller <ian@gaslightmedia.com>
Mon, 10 Aug 2015 16:20:51 +0000 (12:20 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 10 Aug 2015 16:20:51 +0000 (12:20 -0400)
commite31ad5b3d7ec9642cb8c709076dd14138048dd1a
tree472cb4d38fe8fbf052e8846bb4b4b887ece73f7e
parent353f28a2eb420359c59005b82a7a21b0537e34ff
fixed merge errors
css/app.css
css/app.css.map
parts/glm-blocks.php
scss/_main.scss
scss/_slideshow.scss