Tweaking weather undergroundplugin css

diff --git a/footer.php b/footer.php
index d6834f6..ad08953 100644 (file)
--- a/footer.php
+++ b/footer.php
@@ -27,7 +27,12 @@
                                     </div>
                                 </div>
                                 <div id="weather-widget" class="medium-3 columns show-for-large-up text-center">
+<<<<<<< Updated upstream
                                     <?php echo do_shortcode('[wunderground location="Sault Ste Marie, MI" measurement="f" layout="simple" numdays="1" class="local-weather" showdata="alerts,daynames,pop,icon,text,conditions,date,highlow"]'); ?>
+=======
+                                    <?php echo do_shortcode('[wunderground location="Gaylord, MI" measurement="f" layout="simple" numdays="1" class="local-weather" showdata="alerts,daynames,pop,icon,text,conditions,date,highlow"]'); ?>
+
+>>>>>>> Stashed changes
                                 </div>
                             </div>
                         </footer>