From d624db9ef14871112b4099ad3235739ef6c15647 Mon Sep 17 00:00:00 2001 From: DanielAguilar94 Date: Mon, 21 Mar 2022 19:01:55 -0600 Subject: [PATCH 1/8] =?UTF-8?q?A=C3=91ADIENDO=20about-me.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- your-code/about-me.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/your-code/about-me.md b/your-code/about-me.md index 30a999d..f1c1af3 100644 --- a/your-code/about-me.md +++ b/your-code/about-me.md @@ -1,7 +1 @@ -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. +Mi nombre es Daniel Aguilar y tengo 27 años From 8ddd6b914613c6994bc1535adfdecf6a525e5bf0 Mon Sep 17 00:00:00 2001 From: DanielAguilar94 Date: Mon, 21 Mar 2022 19:14:41 -0600 Subject: [PATCH 2/8] Commit Nuevo Archivo --- your-code/about-me.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/your-code/about-me.md b/your-code/about-me.md index f1c1af3..e120132 100644 --- a/your-code/about-me.md +++ b/your-code/about-me.md @@ -1 +1,11 @@ Mi nombre es Daniel Aguilar y tengo 27 años + +Me gusta el futbol americano + +Naci en torreon + +Soy Ingenierio + +Conoci Iron Hack por un amigo + + From 90dff806e83a80e65b6991c8a84933973afaca3b Mon Sep 17 00:00:00 2001 From: DanielAguilar94 Date: Mon, 21 Mar 2022 19:26:48 -0600 Subject: [PATCH 3/8] ok --- your-code/about-me.md | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/your-code/about-me.md b/your-code/about-me.md index e120132..832ea41 100644 --- a/your-code/about-me.md +++ b/your-code/about-me.md @@ -1,11 +1,3 @@ -Mi nombre es Daniel Aguilar y tengo 27 años - -Me gusta el futbol americano - -Naci en torreon - -Soy Ingenierio - -Conoci Iron Hack por un amigo +Nacien torreon y me llamo Daniel From f9b9b8d9b6c9a07183d95abe37b3655f2a6ea342 Mon Sep 17 00:00:00 2001 From: DanielAguilar94 Date: Mon, 21 Mar 2022 19:47:33 -0600 Subject: [PATCH 4/8] ok --- 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 832ea41..9547e4f 100644 --- a/your-code/about-me.md +++ b/your-code/about-me.md @@ -1,3 +1,3 @@ -Nacien torreon y me llamo Daniel +SSSSSSSSSSSSSSSSSSSSJSJJSSJJSJSJSJSJSJSJJSJSJSJSJJSSS From 4b1267d5ec1e3131dcaf696df4859a6212ceb28c Mon Sep 17 00:00:00 2001 From: DanielAguilar94 Date: Tue, 22 Mar 2022 00:20:40 -0600 Subject: [PATCH 5/8] changine file about me --- 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 9547e4f..30a156a 100644 --- a/your-code/about-me.md +++ b/your-code/about-me.md @@ -1,3 +1,3 @@ -SSSSSSSSSSSSSSSSSSSSJSJJSSJJSJSJSJSJSJSJJSJSJSJSJJSSS +git From f0d9dadde64671bbc66b79c60008d5bf18706cb0 Mon Sep 17 00:00:00 2001 From: DanielAguilar94 Date: Tue, 22 Mar 2022 00:32:31 -0600 Subject: [PATCH 6/8] conflict file --- your-code/about-me.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/your-code/about-me.md b/your-code/about-me.md index 832ea41..70c3956 100644 --- a/your-code/about-me.md +++ b/your-code/about-me.md @@ -1,3 +1,7 @@ -Nacien torreon y me llamo Daniel +Nacien torreon y me llamo Daniel +Soy Ingniero Goeifsico +tengo 27 años +soy fanatico de steelers + From b025a880bc3ecca5dabb0184c145f81eba706ac8 Mon Sep 17 00:00:00 2001 From: DanielAguilar94 Date: Tue, 22 Mar 2022 08:26:30 -0600 Subject: [PATCH 7/8] CAMBIANDO MASTER BRANCH --- your-code/about-me.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/your-code/about-me.md b/your-code/about-me.md index 30a156a..d30bfd1 100644 --- a/your-code/about-me.md +++ b/your-code/about-me.md @@ -1,3 +1,2 @@ -git - +Mi nombre es Daniel Aguilar, tengo 27 años soy nacido en Torreon Coahuila y egrese de la UNAM; me gusta la NFL y le voy a los Steelers From afbc745f0501bb2a6c64c978ca15744eb557f685 Mon Sep 17 00:00:00 2001 From: DanielAguilar94 Date: Tue, 22 Mar 2022 08:32:21 -0600 Subject: [PATCH 8/8] CAMBIANDO lab resolving branch --- 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 a9f7164..58d4b72 100644 --- a/your-code/about-me.md +++ b/your-code/about-me.md @@ -1,4 +1,4 @@ -git +mi nombre es daniel aguilar y tengo 27 años, naci en torreon y soy ingeniero. ======= git >>>>>>> 4b1267d5ec1e3131dcaf696df4859a6212ceb28c