#navigation
{
background-color: #181818;
- border: 3px solid #404040;
+ border: 3px solid #606018;
color: #d0d060;
padding: 0.3em;
position: absolute;
#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