From c6693a7c3bf5bee7fa49d5192778e4c86c733ac3 Mon Sep 17 00:00:00 2001 From: Hendrix Date: Fri, 24 Feb 2023 10:17:41 -0600 Subject: [PATCH 1/5] new --- hendrix | 1 + 1 file changed, 1 insertion(+) create mode 100644 hendrix diff --git a/hendrix b/hendrix new file mode 100644 index 0000000..78e752a --- /dev/null +++ b/hendrix @@ -0,0 +1 @@ +This is a new test enviroment for git conflict \ No newline at end of file From a6058758258ae870b4ff8eb67d99c405c28f9695 Mon Sep 17 00:00:00 2001 From: Hendrix Date: Fri, 24 Feb 2023 10:24:38 -0600 Subject: [PATCH 2/5] okay --- hendrix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hendrix b/hendrix index 78e752a..2ca1767 100644 --- a/hendrix +++ b/hendrix @@ -1 +1,2 @@ -This is a new test enviroment for git conflict \ No newline at end of file +This is a new test enviroment for git conflict +making sure everything is on point right here as we move to the next challenge \ No newline at end of file From b5257d6f1303906d845ad0c2f5bfd8761a07efc1 Mon Sep 17 00:00:00 2001 From: Hendrix Date: Fri, 24 Feb 2023 11:01:08 -0600 Subject: [PATCH 3/5] kk --- hendrix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hendrix b/hendrix index 2ca1767..66ec31e 100644 --- a/hendrix +++ b/hendrix @@ -1,2 +1,3 @@ This is a new test enviroment for git conflict -making sure everything is on point right here as we move to the next challenge \ No newline at end of file +making sure everything is on point right here as we move to the next challenge +okay now? \ No newline at end of file From a541f84a38deff17bef66a059d01f076e5a58113 Mon Sep 17 00:00:00 2001 From: Hendrix Date: Fri, 24 Feb 2023 11:13:24 -0600 Subject: [PATCH 4/5] taabay --- Taabay | 1 + 1 file changed, 1 insertion(+) create mode 100644 Taabay diff --git a/Taabay b/Taabay new file mode 100644 index 0000000..7d73a66 --- /dev/null +++ b/Taabay @@ -0,0 +1 @@ +this is a new project \ No newline at end of file From baf25019779075f6ec5c15777dcd96413ba1b713 Mon Sep 17 00:00:00 2001 From: Drixyhendrix <115964415+Drixyhendrix@users.noreply.github.com> Date: Fri, 24 Feb 2023 11:14:45 -0600 Subject: [PATCH 5/5] Delete hendrix --- hendrix | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 hendrix diff --git a/hendrix b/hendrix deleted file mode 100644 index 66ec31e..0000000 --- a/hendrix +++ /dev/null @@ -1,3 +0,0 @@ -This is a new test enviroment for git conflict -making sure everything is on point right here as we move to the next challenge -okay now? \ No newline at end of file