From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 11 May 2015 15:40:03 +0000 (-0400)
Subject: fix merge conflict
X-Git-Tag: v1.2.2~2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=f62435dd7d074401ad440d3410ab1bb77d962ac5;p=WP-Plugins%2Fglm-blocks.git

fix merge conflict
---

f62435dd7d074401ad440d3410ab1bb77d962ac5