diff --git a/vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/production.css b/vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/production.css
index 475b26415..cb83f05a8 100644
--- 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
 }
\ No newline at end of file