fixing header conflict in git

fixing git conflict in header app.css version

diff --git a/header.php b/header.php
index 814f979..57216fe 100644 (file)
--- a/header.php
+++ b/header.php
@@ -6,7 +6,7 @@
     <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">
-    <link rel="stylesheet" href="<?php echo get_stylesheet_directory_uri() ; ?>/css/app.css?v=1.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(); ?>

diff --git a/style.css b/style.css
index 6dd7255..d4318fc 100644 (file)
--- a/style.css
+++ b/style.css
@@ -3,5 +3,5 @@ Theme Name: GaylordCVB
 Author: Gaslight Media
 Author URI: http://www.gaslightmedia.com
 Description: A theme for GaylordCVB
-Version: 1.0.11
+Version: 1.0.12
 */