From 855c8faacccba7f9bcc9925fe81f82cbf99fe579 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 1 Sep 2016 11:19:21 -0400
Subject: [PATCH] Fix comment in header

Making this one a sub version release.
---
 index.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/index.php b/index.php
index 7bd5389..4d772b8 100644
--- a/index.php
+++ b/index.php
@@ -3,11 +3,7 @@
  * Plugin Name: GLM Members Database Events
  * Plugin URI: http://www.gaslightmedia.com/
  * Description: Gaslight Media Members Database.
-<<<<<<< HEAD
- * Version: 1.3.2
-=======
  * Version: 1.3.3
->>>>>>> release/1.3.3
  * Author: Chuck Scott
  * Author URI: http://www.gaslightmedia.com/
  * License: GPL2
-- 
2.17.1