From: Ian Weller Date: Thu, 8 Dec 2016 20:56:29 +0000 (-0500) Subject: Merge branch 'develop' of cvs2:WP-Themes/SierraSands into develop X-Git-Tag: v1.2.0^2~6 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=0e0d62e7c38d77428d955e3dd9a2a75eaf4239c6;p=WP-Themes%2FSierraSands.git Merge branch 'develop' of cvs2:WP-Themes/SierraSands into develop --- 0e0d62e7c38d77428d955e3dd9a2a75eaf4239c6 diff --cc header.php index f87d24d,f4ad455..1ca31a0 --- a/header.php +++ b/header.php @@@ -12,42 -13,101 +12,39 @@@
- - -<<<<<<< HEAD -
-
-
-
- -
-

- Charlevoix - Cheboygan - Emmet
Tri-County
Office of Emergency Management -

-
-
-
-
- -
+
+
+
+
+
+
+ + + +
-
- -
-

Contact

 -
-
-

855-515-1624

+
-
++
+

Contact

 +
-======= -
-
- - - - -
-
-
- - - - ->>>>>>> V1.0.0 -
-
- - -
+
- -
- -
-
-
-
-
-
-
-
-
-
-
-
-
- -
+
+
+
+ +
-
- -
-
+
- +