From f86275e9fd5596e56ceb0350a30f9f1e35afdfe3 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 2 Feb 2015 13:38:34 -0500 Subject: [PATCH 1/4] add Eric Watkins --- students.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/students.txt b/students.txt index d75cb7d..0dcf565 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 +Eric Watkins - WatkinsEric From b78e07adae48e0f8d34398554d55c4909e8f8745 Mon Sep 17 00:00:00 2001 From: Mitchell Koens Date: Mon, 2 Feb 2015 11:51:14 -0700 Subject: [PATCH 2/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 e6535fb8f41d9d98be9b479e802dce16fb3974f9 Mon Sep 17 00:00:00 2001 From: Mitchell Koens Date: Mon, 2 Feb 2015 12:07:56 -0700 Subject: [PATCH 3/4] remove extra information from merge --- students.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/students.txt b/students.txt index 18fe86e..7d43829 100644 --- a/students.txt +++ b/students.txt @@ -1,7 +1,4 @@ Cam Macdonell - cmacdonell Karo Castro-Wusnch - karoantonio -<<<<<<< HEAD Mitchell Koens - mitchkoens -======= Christopher Dubeau - ChrisDubeau ->>>>>>> upstream/master From 9aebbe670ec1261ed112397b4ae8aa89b40cfac2 Mon Sep 17 00:00:00 2001 From: Mitchell Date: Mon, 2 Feb 2015 14:32:13 -0500 Subject: [PATCH 4/4] Add Adam Sykes --- students.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/students.txt b/students.txt index 15a3e10..c757d64 100644 --- a/students.txt +++ b/students.txt @@ -3,3 +3,4 @@ Karo Castro-Wusnch - karoantonio Mitchell Koens - mitchkoens Christopher Dubeau - ChrisDubeau Eric Watkins - WatkinsEric +Adam Sykes - AtrSykes