Skip to content
Snippets Groups Projects
Verified Commit 91209958 authored by David Beniamine's avatar David Beniamine
Browse files

Fix merge fail

parent 6d51714b
No related branches found
No related tags found
No related merge requests found
......@@ -236,11 +236,7 @@ ul.commentlist {
}
ul.commentlist li {
padding: 40px 0;
<<<<<<< HEAD
border-bottom: 1px solid rgba(22,54,36,.1);
=======
border-bottom: 1px solid rgba(22,36,54,.1);
>>>>>>> ad3626bbdd7050526370131bfda22f1cca6cf7e0
}
ul.commentlist time {
font-size: 13px;
......@@ -287,11 +283,7 @@ ul.commentlist {
font-size: 15px;
font-weight: normal;
<<<<<<< HEAD
border: 1px solid rgba(22,54,36,.2);
=======
border: 1px solid rgba(22,36,54,.2);
>>>>>>> ad3626bbdd7050526370131bfda22f1cca6cf7e0
border-radius: 4px;
}
#comment input:focus, #comment textarea:focus {
......@@ -326,11 +318,7 @@ ul.commentlist {
*/
#bottom {
padding: 30px 0 40px;
<<<<<<< HEAD
border-top: 1px solid rgba(22,54,36,.1);
=======
border-top: 1px solid rgba(22,36,54,.1);
>>>>>>> ad3626bbdd7050526370131bfda22f1cca6cf7e0
}
#bottom ul {
float: right;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment