From 70bd178b12e5735cccb6b47978475b737c6f86dc Mon Sep 17 00:00:00 2001
From: Tobias <tobias.brennenstuhl.gy@nps.edu>
Date: Wed, 17 Jul 2019 13:58:26 -0700
Subject: [PATCH] Merge origin/master

Conflicts:
	assignments/ReportingForDuty.md
---
 .../homework1/BrennenstuhlTcpExample1Telnet.java                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework1/BrennenstuhlTcpExample1Telnet.java b/assignments/src/MV3500Cohort2019JulySeptember/homework1/BrennenstuhlTcpExample1Telnet.java
index 5ad83d8308..4833fc55c3 100644
--- a/assignments/src/MV3500Cohort2019JulySeptember/homework1/BrennenstuhlTcpExample1Telnet.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/homework1/BrennenstuhlTcpExample1Telnet.java
@@ -1,5 +1,5 @@
 package MV3500Cohort2019JulySeptember.homework1;
-
+//gitlab test
 import java.io.*;
 import java.net.*;
 
-- 
GitLab