From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Thu, 8 Feb 2018 21:46:55 +0000 (-0500)
Subject: Merge tag 'v1.0.12' into develop
X-Git-Tag: v1.0.20^2~24
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=077575559feabd3a16c3c113176eef2093500bcb;p=WP-Themes%2Fgaylordmichigan.git

Merge tag 'v1.0.12' into develop

fixing git conflict in header
---

077575559feabd3a16c3c113176eef2093500bcb
diff --cc header.php
index 54e48ca,57216fe..e09e5db
--- a/header.php
+++ b/header.php
@@@ -6,12 -6,7 +6,9 @@@
      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
      <title><?php wp_title(); ?></title>
      <link rel="shortcut icon" href="<?php echo get_stylesheet_directory_uri() ; ?>/favicon.ico">
- <<<<<<< HEAD
-     <link rel="stylesheet" href="<?php echo get_stylesheet_directory_uri() ; ?>/css/app.css?v=1.0.10">
 +    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato:100&effect=neon">
- =======
-     <link rel="stylesheet" href="<?php echo get_stylesheet_directory_uri() ; ?>/css/app.css?v=1.0.11">
- >>>>>>> v1.0.11
+     <link rel="stylesheet" href="<?php echo get_stylesheet_directory_uri() ; ?>/css/app.css?v=1.0.12">
++
      <link href='//fonts.googleapis.com/css?family=Open+Sans:400,400italic,700' rel='stylesheet' type='text/css'>
  <!--    <link href='http://fonts.googleapis.com/css?family=Crimson+Text:600italic' rel='stylesheet' type='text/css'>-->
      <?php wp_head(); ?>