From d63dc33be4ca55a56ab66567d25087905c4f27b3 Mon Sep 17 00:00:00 2001 From: catherinehl Date: Thu, 6 Sep 2018 11:48:07 -0400 Subject: [PATCH 1/2] Removing useless.p1.txt file --- useless.p1.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100755 useless.p1.txt diff --git a/useless.p1.txt b/useless.p1.txt deleted file mode 100755 index b808c07..0000000 --- a/useless.p1.txt +++ /dev/null @@ -1 +0,0 @@ -some useless info that we will delete. From bf72bfc9f616e71d78e01ab5c564fb18e1ca08c7 Mon Sep 17 00:00:00 2001 From: catherinehl Date: Fri, 7 Sep 2018 15:33:58 -0400 Subject: [PATCH 2/2] I messed up and forgot to add this file into my branch but instead add the file straight to the master so the TA suggested I re-do this step by adding the file into my own branch, and then merging into the master --- .../gatech/oad/antlab/pkg1/AntLabMain.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/edu/gatech/oad/antlab/pkg1/AntLabMain.java b/src/main/java/edu/gatech/oad/antlab/pkg1/AntLabMain.java index 680f0ab..75ba897 100755 --- a/src/main/java/edu/gatech/oad/antlab/pkg1/AntLabMain.java +++ b/src/main/java/edu/gatech/oad/antlab/pkg1/AntLabMain.java @@ -57,24 +57,24 @@ public void printOutMessage() { + ant22.getMessage() + ant31.getMessage(); //Person1 replace P1 with your name //and gburdell1 with your gt id - Person1 p1 = new Person1("P1"); - toPrint += p1.toString("gburdell1"); + Person1 p1 = new Person1("Catherine Lee"); + toPrint += p1.toString("clee654"); //Person2 replace P2 with your name //and gburdell with your gt id - Person2 p2 = new Person2("P2"); - toPrint += p2.toString("gburdell2"); + Person2 p2 = new Person2("Naim Kabir"); + toPrint += p2.toString("akabir6"); //Person3 replace P3 with your name //and gburdell3 with your gt id - Person3 p3 = new Person3("P3"); - toPrint += p3.toString("gburdell3"); - //Person4 replace P4 with your name - //and gburdell4 with your gt id - Person4 p4 = new Person4("P4"); - toPrint += p4.toString("gburdell4"); - //Person5 replace P4 with your name - //and gburdell5 with your gt id - Person5 p5 = new Person5("P5"); - toPrint += p5.toString("gburdell5"); + Person3 p3 = new Person3("Eva"); + toPrint += p3.toString("ychen840"); + //Person4 replace P4 with your name + //and gburdell4 with your gt id + Person4 p4 = new Person4("Sung Kang"); + toPrint += p4.toString("skang345"); + //Person5 replace P4 with your name + //and gburdell5 with your gt id + Person5 p5 = new Person5("Sam Thomas"); + toPrint += p5.toString("sthomas313"); System.out.println(toPrint);