From 382152608e66bba267eac2d59fcfa2fe1d1063be Mon Sep 17 00:00:00 2001 From: joshdoti Date: Mon, 2 Feb 2015 11:41:52 -0700 Subject: [PATCH 1/3] Added Josh Dotinga --- students.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/students.txt b/students.txt index d75cb7d..a2d0284 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 +Josh Dotinga - dotingaj \ No newline at end of file From e99e3e9515d6ffd9abea78ff2b20476b42b0e87b Mon Sep 17 00:00:00 2001 From: Josh Dotinga Date: Mon, 2 Feb 2015 12:04:31 -0700 Subject: [PATCH 2/3] Update students.txt --- students.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/students.txt b/students.txt index a4059ce..2e5ea9b 100644 --- a/students.txt +++ b/students.txt @@ -1,7 +1,3 @@ Cam Macdonell - cmacdonell Karo Castro-Wusnch - karoantonio -<<<<<<< HEAD -Josh Dotinga - dotingaj -======= -Christopher Dubeau - ChrisDubeau ->>>>>>> upstream/master +Josh Dotinga From f14daae25cb6af0331355a7d0bd9ac725d1a990b Mon Sep 17 00:00:00 2001 From: joshdoti Date: Mon, 2 Feb 2015 12:05:24 -0700 Subject: [PATCH 3/3] Readded Josh Doti --- students.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/students.txt b/students.txt index 2e5ea9b..5e624ab 100644 --- a/students.txt +++ b/students.txt @@ -1,3 +1,3 @@ Cam Macdonell - cmacdonell Karo Castro-Wusnch - karoantonio -Josh Dotinga +Josh Dotinga - dotingaj