From 91209958cf210e87900b3210fb448ec96743d30f Mon Sep 17 00:00:00 2001
From: David Beniamine <david.beniamine@tetras-libre.fr>
Date: Thu, 25 Aug 2016 14:40:31 +0200
Subject: [PATCH] Fix merge fail
---
css/style.css | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/css/style.css b/css/style.css
index d7a57cf..dda0185 100644
--- a/css/style.css
+++ b/css/style.css
@@ -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;
--
GitLab