From: Steve Sutton Date: Tue, 12 Jan 2016 20:54:35 +0000 (-0500) Subject: fix conflict X-Git-Tag: v1.1.0^2~3 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=ca77f73f23106e716dbadbc6086540f7ccd659c6;p=WP-Themes%2Fmountpleasantwow.git fix conflict --- ca77f73f23106e716dbadbc6086540f7ccd659c6