From: Ian Weller <ian@gaslightmedia.com>
Date: Wed, 18 May 2016 18:57:00 +0000 (-0400)
Subject: fixing merge problems
X-Git-Tag: v1.0.4~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=d5eae22fc0d3ae47b5f318bb772acc10fce418d1;p=WP-Themes%2FBayInnPetoskey.git

fixing merge problems
---

d5eae22fc0d3ae47b5f318bb772acc10fce418d1
diff --cc header.php
index 20029a8,b603f92..ddfa983
--- a/header.php
+++ b/header.php
@@@ -28,7 -28,8 +28,7 @@@
                                      <h1>Petoskey, Michigan 49770</h1>
                                      <h1>Reservations: 888-321-2500 - <a target="_blank" href="https://reservation.magnusonhotels.com/bbe/page1.aspx?propertyID=6386">Book Online</a></h1>
                                      <h2>FOR ADDITIONAL AVAILABILITY, CALL HOTEL DIRECT</h2>
-                                 </hgroup>
+                                 </hgroup>    
 -                                    
                              </div>
                          </div>
                      </header>