From 08f479b821f80b842115234fe8e03312152d9e0b Mon Sep 17 00:00:00 2001 From: Anthony Talarico Date: Mon, 23 May 2016 15:29:49 -0400 Subject: [PATCH] fixed syntax error --- classes/glmPluginSupport.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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); -- 2.17.1