From e3a5e3f3df5c0985e8a5c6f4952f5e1645395c8f Mon Sep 17 00:00:00 2001 From: Christopher Dubeau Date: Mon, 2 Feb 2015 11:40:30 -0700 Subject: [PATCH 1/4] Add Christopher Dubeau --- students.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/students.txt b/students.txt index d75cb7d..32ad4d7 100644 --- a/students.txt +++ b/students.txt @@ -1,2 +1,3 @@ Cam Macdonell - cmacdonell -Karo Castro-Wusnch - karoantonio \ No newline at end of file +Karo Castro-Wusnch - karoantonio +Christopher Dubeau - ChrisDubeau \ No newline at end of file From a0676a31841f679179a7816a44f9df54d524ada6 Mon Sep 17 00:00:00 2001 From: Wilson Date: Mon, 2 Feb 2015 13:42:05 -0500 Subject: [PATCH 2/4] add Wilson Ho --- students.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/students.txt b/students.txt index d75cb7d..7e2598f 100644 --- a/students.txt +++ b/students.txt @@ -1,2 +1,3 @@ Cam Macdonell - cmacdonell -Karo Castro-Wusnch - karoantonio \ No newline at end of file +Karo Castro-Wusnch - karoantonio +Wilson Ho - Wilsonkho From b78e07adae48e0f8d34398554d55c4909e8f8745 Mon Sep 17 00:00:00 2001 From: Mitchell Koens Date: Mon, 2 Feb 2015 11:51:14 -0700 Subject: [PATCH 3/4] Add Mitchell Koens --- students.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/students.txt b/students.txt index d75cb7d..b3713ff 100644 --- a/students.txt +++ b/students.txt @@ -1,2 +1,3 @@ Cam Macdonell - cmacdonell -Karo Castro-Wusnch - karoantonio \ No newline at end of file +Karo Castro-Wusnch - karoantonio +Mitchell Koens - mitchkoens From 4d92494d36188d3549b97e40b85089138ec3c662 Mon Sep 17 00:00:00 2001 From: Wilson Date: Mon, 2 Feb 2015 14:39:10 -0500 Subject: [PATCH 4/4] resolved merge conflict --- students.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/students.txt b/students.txt index 2418188..b893068 100644 --- a/students.txt +++ b/students.txt @@ -1,9 +1,5 @@ Cam Macdonell - cmacdonell Karo Castro-Wusnch - karoantonio -<<<<<<< HEAD - -======= Christopher Dubeau - ChrisDubeau Mitchell Koens - mitchkoens Wilson Ho - Wilsonkho ->>>>>>> 4c8089151af6c5276bf75bf4c2b1d227e54f4f2c