From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 11 Jan 2016 18:40:52 +0000 (-0500)
Subject: fix conflict
X-Git-Tag: v1.1.0^2~6
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=fd31031300a72b58048278d4cbb0aa635e2ea96c;p=WP-Themes%2Fmountpleasantwow.git

fix conflict
---

fd31031300a72b58048278d4cbb0aa635e2ea96c