From fa679328616ddfa4734b8e41f74d260b62a93ac4 Mon Sep 17 00:00:00 2001 From: martijnooo Date: Wed, 22 Jan 2025 16:54:30 +0100 Subject: [PATCH 1/4] Only a small adjustment --- your-code/about-me.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/your-code/about-me.md b/your-code/about-me.md index 31b9128..0c9755a 100644 --- a/your-code/about-me.md +++ b/your-code/about-me.md @@ -1,5 +1,5 @@ -# Who am I +# Who am I -> This is just a small change * I was born in Venezuela but moved to Algarve when I was 13. * I have a PhD in Neuroscience but have no intention of staying in academia. From acadcf3e0ac9b128fb3aca9385185b0182544b94 Mon Sep 17 00:00:00 2001 From: martijnooo Date: Wed, 22 Jan 2025 16:57:21 +0100 Subject: [PATCH 2/4] Now with personal information --- your-code/about-me.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/your-code/about-me.md b/your-code/about-me.md index 31b9128..24968ba 100644 --- a/your-code/about-me.md +++ b/your-code/about-me.md @@ -1,17 +1,18 @@ +# Who am I -> This is the default text -# Who am I - -* I was born in Venezuela but moved to Algarve when I was 13. -* I have a PhD in Neuroscience but have no intention of staying in academia. +* I was born in Germany +* I have a bachelor in business and worked in VC * I have some experience analyzing data from my own experiments but no formal training whatsoever. # Why am I here -* I came to Ironhack to learn, meet new people and to open new opportunities. +* I came to Ironhack to learn, meet new people and to open new opportunities. Ultimately, I want to become a data scientist * Proper coding, machine learning, stats! # What will I do after the course? -* Would love to get into the sports industry. +* Would love to get into the robotics industry. * I will look for patterns in data where people are not even looking. * To enjoy myself. + + From f9ebe2a72686102f472cb387e75e16fa8adbcc1d Mon Sep 17 00:00:00 2001 From: martijnooo Date: Fri, 24 Jan 2025 14:17:14 +0100 Subject: [PATCH 3/4] This is a deafult file to test resolving conflicts --- your-code/about-me_v2.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 your-code/about-me_v2.md diff --git a/your-code/about-me_v2.md b/your-code/about-me_v2.md new file mode 100644 index 0000000..e69de29 From 1c0b937f290fe59e74c17059f4fb3b0d0ea9c136 Mon Sep 17 00:00:00 2001 From: martijnooo Date: Fri, 24 Jan 2025 14:20:54 +0100 Subject: [PATCH 4/4] Delte unwanted file --- your-code/about-me_v2.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 your-code/about-me_v2.md diff --git a/your-code/about-me_v2.md b/your-code/about-me_v2.md deleted file mode 100644 index e69de29..0000000