From b3c92cdd7735256cc526f37dcade82ab976c248d Mon Sep 17 00:00:00 2001
From: Melissa Wen <melissa.srw@gmail.com>
Date: Sun, 30 Aug 2015 18:56:18 -0300
Subject: [PATCH] Just remove bad lines (unsolved merge conflicts and unnecessary meta data

---
 style.css | 4 ----
 theme.yml | 1 -
 2 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/style.css b/style.css
index 6da2651..88be576 100644
--- a/style.css
+++ b/style.css
@@ -134,11 +134,7 @@ body {
 
 #content h1, #content h2, #content h3, #content h4, #content h5, #content h6{
   margin-top: 20px;
-<<<<<<< 22561cf84ef741968c2784eb32a3c64c4cc35acc
   margin-bottom: 10px;
-=======
-  margin-bottom:10px
->>>>>>> adjust headers styles on general and specific cases
   color: inherit;
   font-family: Arial;
   font-weight: 700;
diff --git a/theme.yml b/theme.yml
index 28aab66..f5721f4 100644
--- a/theme.yml
+++ b/theme.yml
@@ -1,3 +1,2 @@
 name: "Software Público"
 layout: "application-ng"
-icon_theme: []
--
libgit2 0.21.2