From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Mon, 23 May 2016 19:29:49 +0000 (-0400)
Subject: fixed syntax error
X-Git-Tag: v2.0.0^2~8^2~4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=08f479b821f80b842115234fe8e03312152d9e0b;p=WP-Plugins%2Fglm-member-db.git

fixed syntax error
---

diff --git a/classes/glmPluginSupport.php b/classes/glmPluginSupport.php
index 56cc5276..731086d8 100644
--- a/classes/glmPluginSupport.php
+++ b/classes/glmPluginSupport.php
@@ -534,11 +534,9 @@ return; // Off for now ** Need to make this switchable in management
             $newSlug = sanitize_title($requiredPageInfo['title']);
             $existingSlug = $this->verify_post_slug($newSlug);
             
-<<<<<<< Updated upstream
-            // But only run this if it is the first time this plugin is activated
-=======
+
              // But only run this if it is the first time this plugin is activated
->>>>>>> Stashed changes
+
             if (get_option(GLM_MEMBERS_PLUGIN_OPTION_FIRST_ACTIVATION) == 'true') {
                 if ($newSlug == $existingSlug) {
                     $existingID = $this->get_post_id_by_slug($newSlug);