From 5a9efb7120196aaf05126a4a3af1eafa9a3ddffa Mon Sep 17 00:00:00 2001 From: Morgan Bauer Date: Tue, 13 Oct 2020 12:11:19 -0700 Subject: [PATCH 1/2] a conflict --- file_with_contents | 1 + 1 file changed, 1 insertion(+) create mode 100644 file_with_contents diff --git a/file_with_contents b/file_with_contents new file mode 100644 index 0000000..d968c9d --- /dev/null +++ b/file_with_contents @@ -0,0 +1 @@ +bad changes From 50379dc4660009614ab159700c1eb927dd7af586 Mon Sep 17 00:00:00 2001 From: Victoria-Bediako Date: Thu, 3 Aug 2023 09:03:04 -0400 Subject: [PATCH 2/2] added a new file -put content in the file -it's a great file -we need for the bext segment in class -Hello World! --- file_with_content | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/file_with_content b/file_with_content index fd83c83..113a4c1 100644 --- a/file_with_content +++ b/file_with_content @@ -1 +1,3 @@ -different text + +some changes +additional changes