Remove conflicts

Removing Conflicts.

diff --git a/index.php b/index.php
index 02f817b..ac906f0 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -43,7 +43,7 @@ if (!defined('ABSPATH')) {
  *  so that we're sure the other add-ons see an up to date
  *  version from this plugin.
  */
-define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.7.26');
+define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.7.27');
 /**
  * Plugin DB Version
  */

diff --git a/views/front/events/agenda_new.html b/views/front/events/agenda_new.html
index 979604d..fb17ae7 100644 (file)
--- a/views/front/events/agenda_new.html
+++ b/views/front/events/agenda_new.html
@@ -139,20 +139,6 @@
                                         <img class="" style="float:none;" src="{$imgUrl}{$event.image}">
                                     </div>
                                     {/if}
-<<<<<<< HEAD
-=======
-
-                                    {if $settings.agenda_view_more_enabled}
-                                        <div>
-                                            <a
-                                                class="glm-read-more event-read-more"
-                                                href="{$siteBaseUrl}{$pageSlug}/{if !$customPage}{$event.name_slug}/?glm_event_from={$date|date_format:"%Y-%m-%d"}{else}?eventId={$event.id}{/if}">
-                                                {if $settings.agenda_view_more_text}{$settings.agenda_view_more_text}{else}Read More{/if}
-                                            </a>
-                                        </div>
-                                    {/if}
-
->>>>>>> dc38bda... Setup event detail page to show only the date a recurring event is on.
                                 </div>
                             {/foreach}
                         {/foreach}