From dbd588ae51c9de4cc6569ee4319af62b6a226335 Mon Sep 17 00:00:00 2001 From: martapalleiro <67117201+martapalleiro@users.noreply.github.com> Date: Mon, 22 Jun 2020 15:19:35 +0200 Subject: [PATCH 1/5] Marta Palleiro - lab-resolving-git-conflicts --- your-code/about-me.md | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/your-code/about-me.md b/your-code/about-me.md index 30a999d..e74a770 100755 --- a/your-code/about-me.md +++ b/your-code/about-me.md @@ -1,7 +1,2 @@ -Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque viverra laoreet lorem et dapibus. Integer auctor dignissim egestas. Ut id purus neque. Pellentesque imperdiet lacus in libero laoreet, at tempus felis tristique. Cras fermentum erat a dui vulputate gravida. Nulla aliquet nisi interdum nulla pretium, ac vestibulum diam congue. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Phasellus lacus risus, sodales vitae viverra quis, maximus ac ipsum. Sed consequat viverra mattis. Curabitur iaculis varius mollis. - -Ut porttitor iaculis tellus bibendum euismod. Morbi porta, ante nec tempus porta, felis mi faucibus lacus, sed tristique purus nunc sed est. Aenean pulvinar urna ut lacus interdum aliquam. Pellentesque sit amet magna accumsan, sagittis metus a, volutpat velit. Mauris vitae ex vehicula, posuere nisi sed, sagittis nunc. Ut scelerisque, mi non tristique tristique, mi enim luctus nunc, eu mattis sem quam auctor nunc. Donec lobortis tellus eget blandit ultricies. Vivamus euismod metus eget leo blandit, at malesuada magna efficitur. Praesent sodales faucibus mi, ullamcorper ultrices orci. Vivamus maximus malesuada massa, nec placerat leo feugiat vel. Nam vitae eleifend enim. Nullam interdum ipsum velit, vitae faucibus lectus blandit euismod. - -Suspendisse ut malesuada ex. Nulla ultricies nisl et nisi rhoncus sollicitudin. Vestibulum maximus iaculis ligula, nec commodo nunc ullamcorper nec. Duis quis condimentum sapien. Cras vestibulum interdum felis eu auctor. Quisque semper, magna at dapibus faucibus, felis risus semper ligula, id aliquam lectus ligula vel nisi. In hac habitasse platea dictumst. Donec arcu sapien, suscipit ac dictum et, imperdiet id tortor. Maecenas ornare sodales interdum. Mauris dictum felis eu eros vestibulum cursus. Phasellus accumsan, turpis ut malesuada sollicitudin, augue leo venenatis ante, vel convallis tellus diam sit amet lacus. Aenean eu mauris eros. Praesent ante lacus, gravida sit amet tellus nec, laoreet ultrices lacus. Integer commodo semper vestibulum. Fusce felis massa, consectetur facilisis rutrum nec, pulvinar et nisi. - -Morbi fermentum ultricies tortor, vehicula ultrices eros elementum a. Duis ornare aliquam facilisis. Proin aliquam tincidunt odio vitae dignissim. Sed malesuada lacinia massa, nec blandit urna auctor elementum. Duis auctor non tortor in consequat. Mauris id vestibulum risus. In eget erat sed lacus efficitur viverra sed eu est. Aliquam interdum consequat molestie. Aliquam metus nisi, blandit non semper ut, blandit vel leo. Cras dictum turpis erat, sed iaculis ligula facilisis dapibus. Aliquam posuere dignissim fermentum. Praesent at neque sit amet lectus ornare iaculis. Curabitur id urna quis lorem varius ultrices eu sit amet sapien. Curabitur maximus volutpat suscipit. Proin imperdiet elementum lacus a eleifend. Sed tempor lacus posuere diam vehicula iaculis. +Hello +My name is Marta From cc49f698cf1e50ff499ec40c9edf3e2cda2c2f42 Mon Sep 17 00:00:00 2001 From: Marta Palleiro Date: Mon, 22 Jun 2020 16:16:45 +0200 Subject: [PATCH 2/5] your-code/about-me.md --- your-code/about-me.md | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/your-code/about-me.md b/your-code/about-me.md index 30a999d..e74a770 100755 --- a/your-code/about-me.md +++ b/your-code/about-me.md @@ -1,7 +1,2 @@ -Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque viverra laoreet lorem et dapibus. Integer auctor dignissim egestas. Ut id purus neque. Pellentesque imperdiet lacus in libero laoreet, at tempus felis tristique. Cras fermentum erat a dui vulputate gravida. Nulla aliquet nisi interdum nulla pretium, ac vestibulum diam congue. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Phasellus lacus risus, sodales vitae viverra quis, maximus ac ipsum. Sed consequat viverra mattis. Curabitur iaculis varius mollis. - -Ut porttitor iaculis tellus bibendum euismod. Morbi porta, ante nec tempus porta, felis mi faucibus lacus, sed tristique purus nunc sed est. Aenean pulvinar urna ut lacus interdum aliquam. Pellentesque sit amet magna accumsan, sagittis metus a, volutpat velit. Mauris vitae ex vehicula, posuere nisi sed, sagittis nunc. Ut scelerisque, mi non tristique tristique, mi enim luctus nunc, eu mattis sem quam auctor nunc. Donec lobortis tellus eget blandit ultricies. Vivamus euismod metus eget leo blandit, at malesuada magna efficitur. Praesent sodales faucibus mi, ullamcorper ultrices orci. Vivamus maximus malesuada massa, nec placerat leo feugiat vel. Nam vitae eleifend enim. Nullam interdum ipsum velit, vitae faucibus lectus blandit euismod. - -Suspendisse ut malesuada ex. Nulla ultricies nisl et nisi rhoncus sollicitudin. Vestibulum maximus iaculis ligula, nec commodo nunc ullamcorper nec. Duis quis condimentum sapien. Cras vestibulum interdum felis eu auctor. Quisque semper, magna at dapibus faucibus, felis risus semper ligula, id aliquam lectus ligula vel nisi. In hac habitasse platea dictumst. Donec arcu sapien, suscipit ac dictum et, imperdiet id tortor. Maecenas ornare sodales interdum. Mauris dictum felis eu eros vestibulum cursus. Phasellus accumsan, turpis ut malesuada sollicitudin, augue leo venenatis ante, vel convallis tellus diam sit amet lacus. Aenean eu mauris eros. Praesent ante lacus, gravida sit amet tellus nec, laoreet ultrices lacus. Integer commodo semper vestibulum. Fusce felis massa, consectetur facilisis rutrum nec, pulvinar et nisi. - -Morbi fermentum ultricies tortor, vehicula ultrices eros elementum a. Duis ornare aliquam facilisis. Proin aliquam tincidunt odio vitae dignissim. Sed malesuada lacinia massa, nec blandit urna auctor elementum. Duis auctor non tortor in consequat. Mauris id vestibulum risus. In eget erat sed lacus efficitur viverra sed eu est. Aliquam interdum consequat molestie. Aliquam metus nisi, blandit non semper ut, blandit vel leo. Cras dictum turpis erat, sed iaculis ligula facilisis dapibus. Aliquam posuere dignissim fermentum. Praesent at neque sit amet lectus ornare iaculis. Curabitur id urna quis lorem varius ultrices eu sit amet sapien. Curabitur maximus volutpat suscipit. Proin imperdiet elementum lacus a eleifend. Sed tempor lacus posuere diam vehicula iaculis. +Hello +My name is Marta From 7e428bf2b1b8b7090463bb371782b3134d46f091 Mon Sep 17 00:00:00 2001 From: Marta Palleiro Date: Mon, 22 Jun 2020 17:07:39 +0200 Subject: [PATCH 3/5] Adding changes to the file --- your-code/about-me.md | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/your-code/about-me.md b/your-code/about-me.md index e74a770..a53d8d5 100755 --- a/your-code/about-me.md +++ b/your-code/about-me.md @@ -1,2 +1,17 @@ -Hello -My name is Marta +# Who am I + +* Where are you from? +* What do you do? +* Do you have previous experience with technology/data? + +# Why am I here + +* What has brought you to Ironhack? +* What knowledge/skills do you expect to learn in this bootcamp? + +# What will I do after the bootcamp? + +* Which industry will you seek employment in? +* What will your future role look like? +* What is your career goal? + From fe6facc982953afaabdd0cf85885f7b5ffb30bed Mon Sep 17 00:00:00 2001 From: Marta Palleiro Date: Mon, 22 Jun 2020 17:54:09 +0200 Subject: [PATCH 4/5] Adding introduce yourself --- your-code/about-me.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/your-code/about-me.md b/your-code/about-me.md index a53d8d5..73df911 100755 --- a/your-code/about-me.md +++ b/your-code/about-me.md @@ -1,17 +1,17 @@ # Who am I -* Where are you from? -* What do you do? -* Do you have previous experience with technology/data? +* Where are you from? I'm from Galicia, Spain +* What do you do? Right now I'm working on my data skills +* Do you have previous experience with technology/data? No, zero... # Why am I here -* What has brought you to Ironhack? -* What knowledge/skills do you expect to learn in this bootcamp? +* What has brought you to Ironhack? I'm looking for new job oportunities! +* What knowledge/skills do you expect to learn in this bootcamp? Programming and statistics skills # What will I do after the bootcamp? -* Which industry will you seek employment in? -* What will your future role look like? -* What is your career goal? +* Which industry will you seek employment in? Tech industry +* What will your future role look like? +* What is your career goal? From a307ab8a2af94e9ff8e1c5bfb9205324eeb7a10c Mon Sep 17 00:00:00 2001 From: Marta Palleiro Date: Mon, 22 Jun 2020 21:41:24 +0200 Subject: [PATCH 5/5] resolving conflicts with master branch --- your-code/about-me.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/your-code/about-me.md b/your-code/about-me.md index 7171d84..66fcfcc 100755 --- a/your-code/about-me.md +++ b/your-code/about-me.md @@ -16,7 +16,3 @@ * What will your future role look like? * What is your career goal? -======= -Hello -My name is Marta ->>>>>>> dbd588ae51c9de4cc6569ee4319af62b6a226335