Update menu for conflic

diff --git a/parts/off-canvas-menu.php b/parts/off-canvas-menu.php
index f8bb74f..dd7b330 100644 (file)
--- a/parts/off-canvas-menu.php
+++ b/parts/off-canvas-menu.php
@@ -1,12 +1,5 @@
 <aside class="right-off-canvas-menu" aria-hidden="true">
-<<<<<<< HEAD
-  <ul class="off-canvas-list">
-    <li><a href="<?php echo home_url(); ?>">Home</a></li>
-  </ul>
-  <?php munisingcvb_mobile_off_canvas(); ?>
-=======
     <?php glm_offcanvas_menu(); ?>
->>>>>>> release/1.0.2
   <ul class="off-canvas-list extras">
     <li class="has-form">
       <form role="search" method="get" action="<?php echo home_url('/'); ?>">