From 9c54ea3ad850b99814fc8337555a48386345ae3e Mon Sep 17 00:00:00 2001
From: Josel Carballo <carballo.josel88@gmail.com>
Date: Wed, 11 Mar 2020 18:59:35 +0100
Subject: [PATCH 1/2] Completed 1-parent-child exercise

---
 week-1/1-parent-child/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/week-1/1-parent-child/index.html b/week-1/1-parent-child/index.html
index 458a4cb21..dd4f809f5 100644
--- a/week-1/1-parent-child/index.html
+++ b/week-1/1-parent-child/index.html
@@ -20,7 +20,7 @@
           <p class="message__content">
             Who is available to meet this week to work on our group project?
           </p>
-          <span class="message__time">6:48pm</span>
+          <span class="message__time">7:15pm</span>
         </div>
         <div class="message">
           <div class="message__author">Habiba</div>

From 9d231914ecfe0a4633b367bd80bf4c60267bc308 Mon Sep 17 00:00:00 2001
From: Josel Carballo <carballo.josel88@gmail.com>
Date: Thu, 19 Mar 2020 23:47:16 +0100
Subject: [PATCH 2/2] Completed 18-git merge execrcise

---
 week-2/18-git-merge/styles.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/week-2/18-git-merge/styles.css b/week-2/18-git-merge/styles.css
index 0051cdbaf..af46a4f77 100644
--- a/week-2/18-git-merge/styles.css
+++ b/week-2/18-git-merge/styles.css
@@ -1,6 +1,6 @@
 /* Add your own CSS code below */
 .link {
-  color: #4491db;
+  color: orangered;
   font-weight: 700;
   text-decoration: none;
 }