From e22acb5759cfb172a853c51cef0ea21f727ceead Mon Sep 17 00:00:00 2001
From: Tobias <tobias.brennenstuhl.gy@nps.edu>
Date: Tue, 3 Sep 2019 21:31:37 -0700
Subject: [PATCH] Merge origin/master
Conflicts:
assignments/ReportingForDuty.md
---
.../homework4/Brennenstuhl/BrennenstuhlEspduReceiver.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/BrennenstuhlEspduReceiver.java b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/BrennenstuhlEspduReceiver.java
index 9c60e93950..193a90192d 100755
--- a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/BrennenstuhlEspduReceiver.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/BrennenstuhlEspduReceiver.java
@@ -73,7 +73,7 @@ public class BrennenstuhlEspduReceiver
{
System.out.println(receiptMessage);
Vector3Double position = ((FirePdu)aPdu).getLocationInWorldCoordinates();
- System.out.println(" FirePdu locationInWorldCoordinates: [" + position.getX() + ", " + position.getY() + ", " + position.getZ() + "]");
+ System.out.println(" Chuck Norris locationInWorldCoordinates: [" + position.getX() + ", " + position.getY() + ", " + position.getZ() + "]");
}
else
--
GitLab