From: Laury GvR Date: Wed, 14 Jan 2015 18:56:34 +0000 (-0500) Subject: Earlier conflict, better resolution X-Git-Tag: v1.0.0~74 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=9914d3ec011019adebb92e4b6a1eeef72cd14192;p=WP-Themes%2FRecycleEmmet.git Earlier conflict, better resolution --- diff --git a/header.php b/header.php index f8841b1..9f7fcff 100755 --- a/header.php +++ b/header.php @@ -11,62 +11,9 @@ -

-

-

-

-

-

-

-

-

-

-

-

-

231-348-0640

-

- -

-

-

-

-

- -

-

-

-

-

-

- Is it recyclable?

-

-

-

-

-

-

-

- -

-

- - -

+

+

+

diff --git a/page.php b/page.php index 5010242..b659096 100755 --- a/page.php +++ b/page.php @@ -43,29 +43,9 @@

Emmet County Department of Public Works
200 Division Street, Petoskey, MI 49770 • 231-348-1702

-

-

-

-

-

- - -

-

- - - -

- -

-

-

-

-

-

Emmet County Department of Public Works
200 Division Street, Petoskey, MI 49770 • 231-348-1702

-

-

-

- -

+

+

+

+ +

\ No newline at end of file