Commit 062beb57 authored by Ludovic Courtès's avatar Ludovic Courtès

css: Remove leftover merge conflict markers.

Fixes a regression introduced in 372f5f48. * static/css/main.css: Fix 'h2' lines, which included merge conflict markers.
parent 779b8e62
......@@ -178,11 +178,7 @@ hr {
}
.post h1 { color: #433; }
<<<<<<< HEAD
.post h2 { padding: 0px; margin: 0px; }
=======
.post h2 { color: #433; padding: 0pt; font-size: 1.3rem; }
>>>>>>> 53a0f896f619977fb1d83c014cde093326296393
.post-about {
color: #4D4D4D;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment