Resolve conflicts

2011-11-20 01:35:28 +08:00 · 2011-11-20 01:35:28 +08:00 · c9137737e3
parent e99affbddd e4dc5bd107
commit c9137737e3
1 changed files with 0 additions and 1 deletions
--- a/vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/production.css
+++ b/vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/production.css
@ -48,5 +48,4 @@
 }
 .production a:hover{
 	text-decoration: underline;
->>>>>>> e4dc5bd10760d23b7696c1df132454db368a73cc
 }