From 23cf7a4354e228c26835f9b5799bbdd9ea9a0c45 Mon Sep 17 00:00:00 2001
From: Tobias <tobias.brennenstuhl.gy@nps.edu>
Date: Mon, 9 Sep 2019 22:04:04 -0700
Subject: [PATCH] Merge origin/master
Conflicts:
assignments/ReportingForDuty.md
---
.../homework4/Brennenstuhl/BrennenstuhlEspduReceiver.java | 1 +
.../homework4/Brennenstuhl/BrennenstuhlEspduSender.java | 1 +
2 files changed, 2 insertions(+)
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/BrennenstuhlEspduReceiver.java b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/BrennenstuhlEspduReceiver.java
index 0bf25b2f9c..1dd070ebf7 100755
--- a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/BrennenstuhlEspduReceiver.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/BrennenstuhlEspduReceiver.java
@@ -32,6 +32,7 @@ public class BrennenstuhlEspduReceiver
System.out.println("DisExamplesOpenDis7.EspduReceiver started...");
MulticastSocket socket;
+
DatagramPacket packet;
InetAddress address;
PduFactory pduFactory = new PduFactory();
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/BrennenstuhlEspduSender.java b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/BrennenstuhlEspduSender.java
index 397bde223d..c219d3e7a8 100644
--- a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/BrennenstuhlEspduSender.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/BrennenstuhlEspduSender.java
@@ -20,6 +20,7 @@ import edu.nps.moves.dis7.enumerations.PlatformDomain;
public class BrennenstuhlEspduSender
{
public static final int NUMBER_TO_SEND = 5; // 5000
+
/**
* Default multicast group address we send on.
--
GitLab