From 5d5479100d9ed29c85365cba5a16cbbea452af93 Mon Sep 17 00:00:00 2001 From: Emil Velasquez Date: Mon, 19 Sep 2022 18:23:50 -0500 Subject: [PATCH 1/3] Added Emil and Vinson to PR_Practice --- PR_Practice.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PR_Practice.txt b/PR_Practice.txt index da6acba..fdcecf7 100644 --- a/PR_Practice.txt +++ b/PR_Practice.txt @@ -1 +1,2 @@ -Sahil Jain \ No newline at end of file +Sahil Jain +Emil Velasquez and Vinson Zheng \ No newline at end of file From da377f0f33ef35d95485e5fe26cbc72e23a91326 Mon Sep 17 00:00:00 2001 From: Emil Velasquez Date: Mon, 19 Sep 2022 19:16:54 -0500 Subject: [PATCH 2/3] Handled merge conflict --- PR_Practice.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/PR_Practice.txt b/PR_Practice.txt index fdcecf7..9c86205 100644 --- a/PR_Practice.txt +++ b/PR_Practice.txt @@ -1,2 +1,6 @@ Sahil Jain -Emil Velasquez and Vinson Zheng \ No newline at end of file + + + + +Emil Velasquez \ No newline at end of file From 3b0caf32cb8a1b4f844fd295a209cb1e8d0c902b Mon Sep 17 00:00:00 2001 From: Emil Velasquez Date: Mon, 19 Sep 2022 19:19:56 -0500 Subject: [PATCH 3/3] Now corrected? --- PR_Practice.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/PR_Practice.txt b/PR_Practice.txt index 9c86205..8694a7f 100644 --- a/PR_Practice.txt +++ b/PR_Practice.txt @@ -1,6 +1,5 @@ Sahil Jain - - - - +Naren Bharadwaj +Mehul Murali +Vinson Zheng Emil Velasquez \ No newline at end of file