Skip to content

[Humberto Alcantara Luna] - Lab-resolving-git-conflicts #90

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

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

[Humberto Alcantara Luna] - Lab-resolving-git-conflicts #90

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d8b655
primer cambio
humbertoalcantaraluna Oct 10, 2022
bd6f388
Datos de HAL
humbertoalcantaraluna Oct 10, 2022
f28facb
solving merge problem
humbertoalcantaraluna Oct 10, 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
26 changes: 26 additions & 0 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,3 +1,29 @@
<<<<<<< HEAD
# Who am I

* Where are you from? Mexico City
* What do you do? I'm a senior analyst at DiDi LATAM
* Do you have previous experience with technology/data? In my current position I have a lot of data to analyze

# Why am I here

* What has brought you to Ironhack? Improve myself
* What knowledge/skills do you expect to learn in this bootcamp?Data Analytics

# What will I do after the bootcamp?

* Which industry will you seek employment in? Ecommerce, Energy, Supply Chain and Fast Consuming Goods
* What will your future role look like? Project Manager, CX Manager, Consultant
* What is your career goal? To have my own company and to become a director
=======
Prueba 1



Deprecated*****************************************************************

>>>>>>> 2d8b655043fb1d043005a74edf757795e2ec12d8

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.
Expand Down