From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 2 Jun 2015 16:58:55 +0000 (-0400)
Subject: Update menu for conflic
X-Git-Tag: v1.0.6^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=bc5ae09ac8474fd9138ba735e7352fedb9d200ab;p=WP-Themes%2FMunising.git

Update menu for conflic
---

diff --git a/parts/off-canvas-menu.php b/parts/off-canvas-menu.php
index f8bb74f..dd7b330 100644
--- 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('/'); ?>">