2 Commits 1c13bb35c3 ... 5dcce8ce44

Author SHA1 Message Date
  Christian Matheus Batista Macedo 5dcce8ce44 cor alterada 6 years ago
  Christian Matheus Batista Macedo f306329889 alteracao de cor 6 years ago
2 changed files with 4 additions and 0 deletions
  1. BIN
      Teste/.DS_Store
  2. 4 0
      Teste/introducao-javascript/css/index.css

BIN
Teste/.DS_Store


+ 4 - 0
Teste/introducao-javascript/css/index.css

@@ -8,7 +8,11 @@ body{
8 8
 }
9 9
 
10 10
 header{
11
+<<<<<<< HEAD
12
+	background-color: red;
13
+=======
11 14
 	background-color: yellow;
15
+>>>>>>> 1c13bb35c39e149202a4e8156e12380a311ddef2
12 16
 	height: 3em;
13 17
 	color: #FFF;
14 18
 	margin-bottom: 1em;