update style.css

README.md

@@ -2,7 +2,7 @@
 
 # Student Number: 21107895
 
-# CHECKSUM of last commit: a09a17d167b4b86811145c427b33bf0744177f04
+# CHECKSUM of last commit: 8b1abad78586d34d123b3807d4dfbe07ee71a699
 
 # URL: http://blog-21107895-cmt-120-cw-2-git-blog-21107895.apps.openshift.cs.cf.ac.uk/
 

blog/static/style.css

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