From b994cdbf76cbf881cf36ca2df921d34f293473b0 Mon Sep 17 00:00:00 2001 From: DGus4 Date: Sat, 9 Apr 2022 05:09:38 -0600 Subject: [PATCH 1/5] adding git-fu.py file --- module-1/lab-resolving-git-conflicts/your-code/git-fu.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 module-1/lab-resolving-git-conflicts/your-code/git-fu.py diff --git a/module-1/lab-resolving-git-conflicts/your-code/git-fu.py b/module-1/lab-resolving-git-conflicts/your-code/git-fu.py new file mode 100644 index 000000000..75a9ad1a7 --- /dev/null +++ b/module-1/lab-resolving-git-conflicts/your-code/git-fu.py @@ -0,0 +1 @@ +print('this is the original message') \ No newline at end of file From 0804efe44a9f8ea8b0b686f72985b806e8b98813 Mon Sep 17 00:00:00 2001 From: DGus4 Date: Sat, 9 Apr 2022 05:19:33 -0600 Subject: [PATCH 2/5] altering git-fu file --- module-1/lab-resolving-git-conflicts/your-code/git-fu.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module-1/lab-resolving-git-conflicts/your-code/git-fu.py b/module-1/lab-resolving-git-conflicts/your-code/git-fu.py index 75a9ad1a7..918e99a31 100644 --- a/module-1/lab-resolving-git-conflicts/your-code/git-fu.py +++ b/module-1/lab-resolving-git-conflicts/your-code/git-fu.py @@ -1 +1 @@ -print('this is the original message') \ No newline at end of file +print('this is the altered message') \ No newline at end of file From 149154c6103a86704205dcb2cbbb71224e428219 Mon Sep 17 00:00:00 2001 From: DGus4 Date: Sat, 9 Apr 2022 05:31:30 -0600 Subject: [PATCH 3/5] Adding git-fu2.py file --- module-1/lab-resolving-git-conflicts/your-code/git-fu2.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 module-1/lab-resolving-git-conflicts/your-code/git-fu2.py diff --git a/module-1/lab-resolving-git-conflicts/your-code/git-fu2.py b/module-1/lab-resolving-git-conflicts/your-code/git-fu2.py new file mode 100644 index 000000000..dcee13cd2 --- /dev/null +++ b/module-1/lab-resolving-git-conflicts/your-code/git-fu2.py @@ -0,0 +1 @@ +print('Borrador') \ No newline at end of file From 8383ca447ecf24bf9cf647b0b178d0b71563c5ce Mon Sep 17 00:00:00 2001 From: DGus4 Date: Sat, 9 Apr 2022 05:39:43 -0600 Subject: [PATCH 4/5] this is the master message --- module-1/lab-resolving-git-conflicts/your-code/git-fu.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module-1/lab-resolving-git-conflicts/your-code/git-fu.py b/module-1/lab-resolving-git-conflicts/your-code/git-fu.py index 918e99a31..0f2aa0d95 100644 --- a/module-1/lab-resolving-git-conflicts/your-code/git-fu.py +++ b/module-1/lab-resolving-git-conflicts/your-code/git-fu.py @@ -1 +1 @@ -print('this is the altered message') \ No newline at end of file +print('this is the master message') \ No newline at end of file From 60077e5ffd714fa23aad621b7137104c100de286 Mon Sep 17 00:00:00 2001 From: DGus4 Date: Sun, 10 Apr 2022 15:09:54 -0600 Subject: [PATCH 5/5] This is the information about me:: --- .../your-code/about-me.md | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/module-1/lab-resolving-git-conflicts/your-code/about-me.md b/module-1/lab-resolving-git-conflicts/your-code/about-me.md index 30a999d50..8f0c95b2e 100644 --- a/module-1/lab-resolving-git-conflicts/your-code/about-me.md +++ b/module-1/lab-resolving-git-conflicts/your-code/about-me.md @@ -1,7 +1,16 @@ -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 +*Where are you from ? Orizaba, Veracruz +*What do you do ? Right now im in college studying biochemistry engeneering. +*Do you have previous experience with technology/data ? Yes , in high-schooling i studied conding. -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. +#Why am i here +*What has brought you to Irohack ? Im trying to get a job as a data scientist, i thing that they are really wll paid. +* What knowledge/skills do you expect to learn in this bootcamp? I would like to learn as much as ia can in python and MySQL + +# What will I do after the bootcamp? + +* Which industry will you seek employment in? Any tec company would be alright +* What will your future role look like? Analizing lots of data and make it easy to comprenhend +* What is your career goal? Get a job jeje. -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.