X-Git-Url: http://git.steven-mcdonald.id.au/?p=www.git;a=blobdiff_plain;f=style.css;h=dffaa43e5cb556d2ce17ca02dd3f984065a90d8e;hp=e67da8af0a9d9a767b0ac17bee332d4d952b6791;hb=5797da5a0e1bb5a833c9d50b8eaf2ff57476816b;hpb=0657ba5db2c924943be82587fc891ab574584b57

diff --git a/style.css b/style.css
old mode 100755
new mode 100644
index e67da8a..dffaa43
--- a/style.css
+++ b/style.css
@@ -121,7 +121,7 @@ strong
 #navigation
 {
   background-color: #181818;
-  border: 3px solid #404040;
+  border: 3px solid #606018;
   color: #d0d060;
   padding: 0.3em;
   position: absolute;
@@ -133,20 +133,12 @@ strong
 
 #navigation a:link,#navigation a:visited
 {
-<<<<<<< HEAD
-  color: #d0d060;
-=======
-  color: #b0b0b0;
->>>>>>> 8e5d15f920de50d67239e70fc39673ba73bd549c
+  color: #d0d040;
 }
 
 #navigation a:active,#navigation a:hover
 {
-<<<<<<< HEAD
-  color: #e0e065;
-=======
-  color: #c0c0c0;
->>>>>>> 8e5d15f920de50d67239e70fc39673ba73bd549c
+  color: #e0e045;
 }
 
 #navigation ul