From 80d7f955a65f09f1f00f2f5df92552e5bc14d131 Mon Sep 17 00:00:00 2001
From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Thu, 27 Dec 2018 08:34:53 -0500
Subject: [PATCH] releasing theme

---
 style.css | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/style.css b/style.css
index 4ec280e..e0162f7 100644
--- a/style.css
+++ b/style.css
@@ -1,11 +1,7 @@
 /*
 Theme Name: City of Harbor Springs
-<<<<<<< Updated upstream
-=======
-
->>>>>>> Stashed changes
 Author: Gaslight Media
 Author URI: http://www.gaslightmedia.com
 Description: A theme for City of Harbor Springs
-Version: 0.0.1
+Version: 1.0.0
 */
-- 
2.17.1