Just remove bad lines (unsolved merge conflicts and unnecessary meta data

Melissa Wen
1 parent 3a0e28ed
Showing 2 changed files with 0 additions and 5 deletions Show diff stats
style.css
theme.yml
@@ -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;
 name: "Software Público"
 layout: "application-ng"
-icon_theme: []
...	...	@@ -134,11 +134,7 @@ body {
134	134
135	135	#content h1, #content h2, #content h3, #content h4, #content h5, #content h6{
136	136	margin-top: 20px;
137		-<<<<<<< 22561cf84ef741968c2784eb32a3c64c4cc35acc
138	137	margin-bottom: 10px;
139		-=======
140		- margin-bottom:10px
141		->>>>>>> adjust headers styles on general and specific cases
142	138	color: inherit;
143	139	font-family: Arial;
144	140	font-weight: 700;
...	...