Resolve conflicts

This commit is contained in:
chris2tof 2011-11-20 01:35:28 +08:00
commit c9137737e3
1 changed files with 0 additions and 1 deletions

View File

@ -48,5 +48,4 @@
}
.production a:hover{
text-decoration: underline;
>>>>>>> e4dc5bd10760d23b7696c1df132454db368a73cc
}