From c346a841f9cbfc3fbea26e63400c67a9e0dd6d06 Mon Sep 17 00:00:00 2001
From: Adam Fairhead <adam@fairheadcreative.com>
Date: Fri, 18 Jan 2013 17:10:36 -0500
Subject: [PATCH] Merged conflict

---
 fc-webicons.css  | 4 +---
 fc-webicons.html | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/fc-webicons.css b/fc-webicons.css
index 0d263f2..61aa0e5 100644
--- a/fc-webicons.css
+++ b/fc-webicons.css
@@ -41,19 +41,17 @@
 .no-svg .fc-webicon.bitbucket.small { background: url("images/fc-webicon-bitbucket-s.png"); }
 .svg .fc-webicon.bitbucket { background: url("images/fc-webicon-bitbucket.svg"); }
 
-<<<<<<< HEAD
 /* Blogger */
 .no-svg .fc-webicon.blogger { background: url("images/fc-webicon-blogger-m.png"); }
 .no-svg .fc-webicon.blogger.large { background: url("images/fc-webicon-blogger"); }
 .no-svg .fc-webicon.blogger.small { background: url("images/fc-webicon-blogger-s.png"); }
 .svg .fc-webicon.blogger { background: url("images/fc-webicon-blogger"); }
-=======
+
 /* Coderwall */
 .no-svg .fc-webicon.coderwall { background: url("images/fc-webicon-coderwall-m.png"); }
 .no-svg .fc-webicon.coderwall.large { background: url("images/fc-webicon-coderwall.png"); }
 .no-svg .fc-webicon.coderwall.small { background: url("images/fc-webicon-coderwall-s.png"); }
 .svg .fc-webicon.coderwall { background: url("images/fc-webicon-coderwall.svg"); }
->>>>>>> 32ec582b12ab4257c789d27c551abd24372ac4f9
 
 /* Creative Cloud */
 .no-svg .fc-webicon.creativecloud { background: url("images/fc-webicon-creativecloud-m.png"); }
diff --git a/fc-webicons.html b/fc-webicons.html
index 2931186..6effb28 100644
--- a/fc-webicons.html
+++ b/fc-webicons.html
@@ -34,11 +34,11 @@
     <a class="fc-webicon behance small" href="#">Behance</a>
     
     <a class="fc-webicon bitbucket small" href="#">Bitbucket</a>
-
-    <a class="fc-webicon coderwall small" href="#">Coderwall</a>
     
     <a class="fc-webicon blogger small" href="#">Blogger</a>
     
+    <a class="fc-webicon coderwall small" href="#">Coderwall</a>
+    
     <a class="fc-webicon creativecloud small" href="#">Creative Cloud</a>
     
     <a class="fc-webicon dribbble small" href="#">Dribbble</a>