From: Steven McDonald <steven.mcdonald@libremail.me>
Date: Mon, 7 Feb 2011 11:43:13 +0000 (+1100)
Subject: Merge branch 'master' of palpatine:/srv/git/www
X-Git-Url: http://git.steven-mcdonald.id.au/?p=www.git;a=commitdiff_plain;h=0657ba5db2c924943be82587fc891ab574584b57;hp=821eff32ecc99e4478d9e09903579b2905f33be5

Merge branch 'master' of palpatine:/srv/git/www

Conflicts:
	style.css
---

diff --git a/style.css b/style.css
index 5418080..e67da8a 100755
--- a/style.css
+++ b/style.css
@@ -133,12 +133,20 @@ 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