From 08c4b6eb6e85c647fa20c8555bdc7c3bc8c0f3ab Mon Sep 17 00:00:00 2001 From: Tim Schweizer Date: Mon, 30 Sep 2019 19:04:05 -0600 Subject: [PATCH 1/3] Update Shape.java --- app/src/main/java/Shape.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/java/Shape.java b/app/src/main/java/Shape.java index 0c66492..6e809a9 100644 --- a/app/src/main/java/Shape.java +++ b/app/src/main/java/Shape.java @@ -1,4 +1,8 @@ public abstract class Shape { public int x; public int y; +<<<<<<< Updated upstream +======= + public String color = "brown"; +>>>>>>> Stashed changes } From 9ed38502f5ede329b86179503ef8a71a28a2b1f3 Mon Sep 17 00:00:00 2001 From: Tim Schweizer Date: Mon, 30 Sep 2019 19:12:18 -0600 Subject: [PATCH 2/3] Update Shape.java --- app/src/main/java/Shape.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/src/main/java/Shape.java b/app/src/main/java/Shape.java index 6e809a9..74cc419 100644 --- a/app/src/main/java/Shape.java +++ b/app/src/main/java/Shape.java @@ -1,8 +1,5 @@ public abstract class Shape { public int x; public int y; -<<<<<<< Updated upstream -======= - public String color = "brown"; ->>>>>>> Stashed changes + public String color="periwinkle"; } From 47ea21a3c387ef4afc0f1639059fcce36290a38c Mon Sep 17 00:00:00 2001 From: Tim Schweizer Date: Mon, 30 Sep 2019 19:13:20 -0600 Subject: [PATCH 3/3] Update Shape.java --- app/src/main/java/Shape.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/Shape.java b/app/src/main/java/Shape.java index 74cc419..f9bd1cf 100644 --- a/app/src/main/java/Shape.java +++ b/app/src/main/java/Shape.java @@ -1,5 +1,5 @@ public abstract class Shape { public int x; public int y; - public String color="periwinkle"; + public String color= "periwinkle"; }