From ae1fd9bca554b4860aa893a85197f277f4f82235 Mon Sep 17 00:00:00 2001 From: adamtbui Date: Thu, 4 Feb 2021 11:02:37 -0700 Subject: [PATCH 1/2] Merge Conflict --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 495ba54..6af1a12 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ # ScriptyScripts -Adam Bui \ No newline at end of file +Adam Bui +Tim Bauer +Jingqi Liu \ No newline at end of file From 735b2f0f2de771b2fe77a04fabdb18a46d1a3a5e Mon Sep 17 00:00:00 2001 From: adamtbui Date: Thu, 4 Feb 2021 11:06:21 -0700 Subject: [PATCH 2/2] Merge Resolve --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6af1a12..6b31cca 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # ScriptyScripts +PROJECT TEAM MEMBERS Adam Bui Tim Bauer Jingqi Liu \ No newline at end of file