Merge branch 'tarea' of git://github.com/luciadelgado/training-git-1 …

…into luciadelgado-tarea Conflicts: index.html
ckozus · Apr 11, 2015 · e0a079c · e0a079c
2 parents 644885b + ff3c531
commit e0a079c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/index.html b/index.html
@@ -2,6 +2,7 @@
 <head>
   <link href="estilos.css" media="all" rel="stylesheet" />
   <title>Prueba Taller de Git y Github - Pagina Principal</title>
+  <link rel="stylesheet" href="lucia.css">
 </head>
 <body>
   <h2>Informacion de Carlos Kozuszko</h2>

diff --git a/lucia.css b/lucia.css
@@ -0,0 +1,11 @@
+h2{
+	color:red;
+}
+ul{
+	font-size: 20px;
+	font-family: arial;
+
+}
+h3{
+	color:pink;
+}