Fix conflict markers

remove conflict markers

diff --git a/views/front/events/agenda_new.html b/views/front/events/agenda_new.html
index 691f4eb..d8f939a 100644 (file)
--- a/views/front/events/agenda_new.html
+++ b/views/front/events/agenda_new.html
@@ -152,11 +152,6 @@ a.glm-read-more:hover, a.event-read-more:hover {
                                         <img class="" style="float:none;" src="{$imgUrl}{$event.image}">
                                     </div>
                                     {/if}
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-=======
->>>>>>> v1.7.26
 
                                     {if $settings.agenda_view_more_enabled}
                                         <div>
@@ -168,10 +163,6 @@ a.glm-read-more:hover, a.event-read-more:hover {
                                         </div>
                                     {/if}
 
-<<<<<<< HEAD
-=======
->>>>>>> dc38bda... Setup event detail page to show only the date a recurring event is on.
->>>>>>> v1.7.26
                                 </div>
                             {/foreach}
                         {/foreach}