Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Liliana Leon] - lab resolving git conflicts #88

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[Liliana Leon] - lab resolving git conflicts #88

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92fb2d4
Adding a paragraph
lileont Oct 3, 2022
6de05e4
Introduction
lileont Oct 3, 2022
fa734ab
Conflict resolved
lileont Oct 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions lab-resolving-git-conflicts/your-code/about-me.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,28 @@
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.
Who am I
I'm Liliana, a proud mexican. I am the second child,my parents are Javier and Blanca and my big brother is Javier. I have 2 nephews whom I love very much.
* Where are you from?
I was born and raised in Mexico city
* What do you do?
I try to live to the fullest, appreciating the present and enjoying my loved ones company. Work related...I help DHL to offer attractive and profitable rates to our global customers

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.
* Do you have previous experience with technology/data? I do handle data in my work but with excel and sometime powerbi

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.
# Why am I here
I want to expand my skills I want to learn how to use these new technologies

# What has brought you to Ironhack?
A recommendation from a friend and I read the story about how an Ironhack's bootcamp changed the professional life of a guy who was tired of his job

* What knowledge/skills do you expect to learn in this bootcamp?
I'm expecting to learn how to use python and other tools in order to improve my analysis skills

# What will I do after the bootcamp?

* Which industry will you seek employment in?
I probably stay in the company I'm currently working but looking for another role or looking to get a hustle applying what I learn in this bootcamp
* What will your future role look like?
Applying the knowledge I'll get in the bootcamp

* What is your career goal?
That's a work in progress answer

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.