Teste/introducao-javascript/css/index.css

@@ -8,7 +8,11 @@ body{
 }
 
 header{
+<<<<<<< HEAD
+	background-color: red;
+=======
 	background-color: yellow;
+>>>>>>> 1c13bb35c39e149202a4e8156e12380a311ddef2
 	height: 3em;
 	color: #FFF;
 	margin-bottom: 1em;