update style.css

blog/static/style.css

@@ -123,7 +123,6 @@ select {
 #password,
 #password2,
 #submit,
-<<<<<<< HEAD
 #username,
 #score {
   font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
@@ -131,9 +130,6 @@ select {
 }
 
 .comment_text, .post_rating {
-=======
-#username {
->>>>>>> b940bdc779549d786c8f9d7ff3eac9d17425f113
   font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
   font-size: 15px;
 }