Merge branch 'release/1.0.0'
authorIan Weller <ian@gaslightmedia.com>
Wed, 24 May 2017 16:58:57 +0000 (12:58 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 24 May 2017 16:58:57 +0000 (12:58 -0400)
Conflicts:
style.css

1  2 
style.css

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