From: Steven McDonald <steven.mcdonald@libremail.me>
Date: Mon, 7 Feb 2011 11:44:23 +0000 (+1100)
Subject: fixed shit
X-Git-Url: http://git.steven-mcdonald.id.au/?p=www.git;a=commitdiff_plain;h=834fec6f438a610b11c73c711195636be7ec99eb

fixed shit
---

diff --git a/style.css b/style.css
index e67da8a..5418080 100755
--- a/style.css
+++ b/style.css
@@ -133,20 +133,12 @@ strong
 
 #navigation a:link,#navigation a:visited
 {
-<<<<<<< HEAD
   color: #d0d060;
-=======
-  color: #b0b0b0;
->>>>>>> 8e5d15f920de50d67239e70fc39673ba73bd549c
 }
 
 #navigation a:active,#navigation a:hover
 {
-<<<<<<< HEAD
   color: #e0e065;
-=======
-  color: #c0c0c0;
->>>>>>> 8e5d15f920de50d67239e70fc39673ba73bd549c
 }
 
 #navigation ul