From e3f5e1b231289eacdd7465c63165b359be8a7e36 Mon Sep 17 00:00:00 2001
From: Eduardo Martins <eduard_motta@hotmail.com>
Date: Wed, 12 Feb 2020 21:45:38 +0000
Subject: [PATCH] changing commit

---
 your-code/about-me.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/your-code/about-me.md b/your-code/about-me.md
index 1b7eff3..6033658 100644
--- a/your-code/about-me.md
+++ b/your-code/about-me.md
@@ -1,5 +1,9 @@
 NEW BRANCH - MODIFIED TO PROVOKE A CONFLICT, FIXED AFTERWARDS ----
 
-Carla is a passionate, honest, web developer musician and financier.
+Eduardo passionate about coding, current finishing WebDev and starting Python.
 
-Learning the new tech world lingo and pursuing all passions while trying to watch all the top 250 movies she can find.
+
+
+<!-- Carla is a passionate, honest, web developer musician and financier.
+
+Learning the new tech world lingo and pursuing all passions while trying to watch all the top 250 movies she can find. -->