Fix comment in header

Making this one a sub version release.

diff --git a/index.php b/index.php
index 7bd5389..4d772b8 100644 (file)
--- 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