fixed syntax error

diff --git a/classes/glmPluginSupport.php b/classes/glmPluginSupport.php
index 56cc527..731086d 100644 (file)
--- 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);