From 166311ac93aa68af91e3fbc785fbf13cb024375b Mon Sep 17 00:00:00 2001 From: Mike Wittie Date: Wed, 12 Feb 2020 12:34:02 -0700 Subject: [PATCH 1/5] modified file.txt --- file.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/file.txt b/file.txt index e69de29..b3ba99b 100644 --- a/file.txt +++ b/file.txt @@ -0,0 +1 @@ +2+2=1 From 104e418fb7a2df6ce018293c3ac000d68c4c0305 Mon Sep 17 00:00:00 2001 From: Mike Wittie Date: Wed, 12 Feb 2020 12:34:58 -0700 Subject: [PATCH 2/5] changed file.txt --- file.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/file.txt b/file.txt index e69de29..f405492 100644 --- a/file.txt +++ b/file.txt @@ -0,0 +1 @@ +2+2=3 From 01e5cde52e5885d6092c18d6ddbe5e566c3b92d9 Mon Sep 17 00:00:00 2001 From: cweeding1 Date: Fri, 21 Feb 2020 15:53:43 -0700 Subject: [PATCH 3/5] modified P file --- participants.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/participants.txt b/participants.txt index 408b6b7..65d44e2 100644 --- a/participants.txt +++ b/participants.txt @@ -1,2 +1,3 @@ Add your name to the list below: Mike Wittie +Colton Weeding From bd02deee49d71ad263dee5a4b6d92b6fbaeec23c Mon Sep 17 00:00:00 2001 From: cweeding1 Date: Fri, 21 Feb 2020 15:58:13 -0700 Subject: [PATCH 4/5] branch1 change --- file.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file.txt b/file.txt index b3ba99b..867767b 100644 --- a/file.txt +++ b/file.txt @@ -1 +1 @@ -2+2=1 +2+2=4 From dfa7b118a7b6bda53587767f65db583c30720796 Mon Sep 17 00:00:00 2001 From: cweeding1 Date: Fri, 21 Feb 2020 15:59:44 -0700 Subject: [PATCH 5/5] change branch2 --- file.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file.txt b/file.txt index f405492..867767b 100644 --- a/file.txt +++ b/file.txt @@ -1 +1 @@ -2+2=3 +2+2=4