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

Conflicts:
	style.css

diff --git a/style.css b/style.css
index 54180809b5bd0118484b8c452b8a293ead2a9308..e67da8af0a9d9a767b0ac17bee332d4d952b6791 100755 (executable)
--- 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