From: Ian Weller <ian@gaslightmedia.com>
Date: Wed, 24 May 2017 16:58:57 +0000 (-0400)
Subject: Merge branch 'release/1.0.0'
X-Git-Tag: v1.0.1~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=646e5448b7da35e1f1c135a250ebd48f87096554;p=WP-Themes%2Fpetoskeyveterinarian.git

Merge branch 'release/1.0.0'

Conflicts:
	style.css
---

646e5448b7da35e1f1c135a250ebd48f87096554
diff --cc style.css
index 38d2fd7,efbab0d..ec31634
--- a/style.css
+++ b/style.css
@@@ -1,7 -1,7 +1,7 @@@
  /*
- Theme Name: CampPetosega
+ Theme Name: BayshoreAnimalHospital
  Author: Gaslight Media
  Author URI: http://www.gaslightmedia.com
- Description: A theme based off of CampPetosega
- Version: 1.0.28
+ Description: A theme made for BayshoreAnimalHospital
 -Version: 1.0
++Version: 1.0.0
  */