From 2574221d95603cd61023ee60a69393d2e2a7be28 Mon Sep 17 00:00:00 2001 From: Brittany Date: Mon, 2 Feb 2015 11:48:45 -0700 Subject: [PATCH 1/2] add Brittany --- README.md | 2 +- students.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 76c268c..07fc115 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ 395lab ====== -A demonstration of forking for CMPUT 395 +A demonstration of forking for CMPT 395 \ No newline at end of file diff --git a/students.txt b/students.txt index d75cb7d..66d3135 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 +Brittany Lohner - lohnerb3 From d456e21ec1432a2858110a30e67505aacd12b20a Mon Sep 17 00:00:00 2001 From: Brittany Date: Mon, 2 Feb 2015 12:14:50 -0700 Subject: [PATCH 2/2] merged joshBranch? --- students.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/students.txt b/students.txt index 66d3135..848a7a2 100644 --- a/students.txt +++ b/students.txt @@ -1,3 +1,4 @@ Cam Macdonell - cmacdonell Karo Castro-Wusnch - karoantonio Brittany Lohner - lohnerb3 +Josh Dotinga