From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Thu, 27 Dec 2018 13:34:53 +0000 (-0500)
Subject: releasing theme
X-Git-Tag: v1.0.0^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=80d7f955a65f09f1f00f2f5df92552e5bc14d131;p=WP-Themes%2Fcityofharborsprings.git

releasing theme
---

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
 */