From 9e7fce292c21c78f2d35d30ad408c89635574497 Mon Sep 17 00:00:00 2001 From: pgblanco18 Date: Tue, 17 Oct 2023 16:24:04 +0000 Subject: [PATCH 1/4] Copy of read me with additional description of the workshop. --- MariaCopyOfREADME.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 MariaCopyOfREADME.md diff --git a/MariaCopyOfREADME.md b/MariaCopyOfREADME.md new file mode 100644 index 0000000..bf4dac7 --- /dev/null +++ b/MariaCopyOfREADME.md @@ -0,0 +1,2 @@ +# git-training +Describing the workshop \ No newline at end of file From b185f7d8332f11a3abcdb0904e6c1591c7285093 Mon Sep 17 00:00:00 2001 From: pgblanco18 Date: Tue, 17 Oct 2023 16:32:04 +0000 Subject: [PATCH 2/4] text added --- MariaCopyOfREADME.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/MariaCopyOfREADME.md b/MariaCopyOfREADME.md index bf4dac7..16d7e10 100644 --- a/MariaCopyOfREADME.md +++ b/MariaCopyOfREADME.md @@ -1,2 +1,5 @@ # git-training -Describing the workshop \ No newline at end of file +Describing the workshop + + +testando new branch \ No newline at end of file From fe4d6ba4b17b736874b728a1037383364d116da0 Mon Sep 17 00:00:00 2001 From: pgblanco18 Date: Tue, 17 Oct 2023 16:33:34 +0000 Subject: [PATCH 3/4] CONFLITO --- MariaCopyOfREADME.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MariaCopyOfREADME.md b/MariaCopyOfREADME.md index bf4dac7..00d760b 100644 --- a/MariaCopyOfREADME.md +++ b/MariaCopyOfREADME.md @@ -1,2 +1,3 @@ # git-training -Describing the workshop \ No newline at end of file +Describing the workshop +GERANDO CONFLITOOOO HAHAHA \ No newline at end of file From d6a7cfa398ef63b0fbb97807e5ee89e36affe791 Mon Sep 17 00:00:00 2001 From: pgblanco18 Date: Tue, 17 Oct 2023 16:42:51 +0000 Subject: [PATCH 4/4] conflict --- MariaCopyOfREADME.md | 1 - 1 file changed, 1 deletion(-) diff --git a/MariaCopyOfREADME.md b/MariaCopyOfREADME.md index 00d760b..719801e 100644 --- a/MariaCopyOfREADME.md +++ b/MariaCopyOfREADME.md @@ -1,3 +1,2 @@ # git-training -Describing the workshop GERANDO CONFLITOOOO HAHAHA \ No newline at end of file