From f5e53610efa475ef9659048ae27a923f75e37b74 Mon Sep 17 00:00:00 2001
From: Tobias <tobias.brennenstuhl.gy@nps.edu>
Date: Mon, 9 Sep 2019 22:01:44 -0700
Subject: [PATCH] Merge origin/master
Conflicts:
assignments/ReportingForDuty.md
---
.../homework4/Brennenstuhl/BrennenstuhlEspduReceiver.java | 4 ++--
...nenstuhllEspduSender.java => BrennenstuhlEspduSender.java} | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
rename assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/{BrennenstuhllEspduSender.java => BrennenstuhlEspduSender.java} (99%)
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/BrennenstuhlEspduReceiver.java b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/BrennenstuhlEspduReceiver.java
index 193a90192d..0bf25b2f9c 100755
--- a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/BrennenstuhlEspduReceiver.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/BrennenstuhlEspduReceiver.java
@@ -22,10 +22,10 @@ public class BrennenstuhlEspduReceiver
public static final int MAX_PDU_SIZE = 8192;
/** Default multicast group address we send on. */
- public static final String DEFAULT_MULTICAST_ADDRESS = BrennenstuhllEspduSender.DEFAULT_MULTICAST_ADDRESS;
+ public static final String DEFAULT_MULTICAST_ADDRESS = BrennenstuhlEspduSender.DEFAULT_MULTICAST_ADDRESS;
/** Default multicast port used, matches Wireshark DIS capture default */
- public static final int DEFAULT_MULTICAST_PORT = BrennenstuhllEspduSender.DEFAULT_MULTICAST_PORT;
+ public static final int DEFAULT_MULTICAST_PORT = BrennenstuhlEspduSender.DEFAULT_MULTICAST_PORT;
public static void main(String args[])
{
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/BrennenstuhllEspduSender.java b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/BrennenstuhlEspduSender.java
similarity index 99%
rename from assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/BrennenstuhllEspduSender.java
rename to assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/BrennenstuhlEspduSender.java
index 34cdf054a3..397bde223d 100644
--- a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/BrennenstuhllEspduSender.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/BrennenstuhlEspduSender.java
@@ -17,7 +17,7 @@ import edu.nps.moves.dis7.enumerations.PlatformDomain;
* @author Don McGregor
* @author Don Brutzman
*/
-public class BrennenstuhllEspduSender
+public class BrennenstuhlEspduSender
{
public static final int NUMBER_TO_SEND = 5; // 5000
--
GitLab