From 924608d27da7c91f194b6d7de0e9e26b564b4d15 Mon Sep 17 00:00:00 2001
From: Tobias <tobias.brennenstuhl.gy@nps.edu>
Date: Mon, 22 Jul 2019 10:13:15 -0700
Subject: [PATCH] Merge origin/master
Conflicts:
assignments/ReportingForDuty.md
---
.../BrennenstuhlTcpExample1Telnet.java | 28 +++++++++----------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework1/BrennenstuhlTcpExample1Telnet.java b/assignments/src/MV3500Cohort2019JulySeptember/homework1/BrennenstuhlTcpExample1Telnet.java
index a8718bdb0c..719f56e405 100644
--- a/assignments/src/MV3500Cohort2019JulySeptember/homework1/BrennenstuhlTcpExample1Telnet.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/homework1/BrennenstuhlTcpExample1Telnet.java
@@ -53,22 +53,22 @@ public class BrennenstuhlTcpExample1Telnet
PrintStream ps = new PrintStream(os);
//ps.println("This client response was written by server TcpExample1."); // to remote clientnc
- ps.println(" ## ### ");
- ps.println(" ## # # ");
- ps.println(" ## # ");
- ps.println(" ## ## # ");
- ps.println("####### # ");
- ps.println(" ## # ");
- ps.println(" ## ###### ");
+ ps.println(" ## ### ");
+ ps.println(" ## # # ");
+ ps.println(" ## # ");
+ ps.println(" ## ## # ");
+ ps.println(" ####### # ");
+ ps.println(" ## # ");
+ ps.println(" ## ###### ");
//System.out.println("This server response was written by server TcpExample1."); // to server console
- System.out.println(" ## ### ");
- System.out.println(" ## # # ");
- System.out.println(" ## # ");
- System.out.println(" ## ## # ");
- System.out.println("####### # ");
- System.out.println(" ## # ");
- System.out.println(" ## ###### ");
+ System.out.println(" ## ### ");
+ System.out.println(" ## # # ");
+ System.out.println(" ## # ");
+ System.out.println(" ## ## # ");
+ System.out.println(" ####### # ");
+ System.out.println(" ## # ");
+ System.out.println(" ## ###### ");
--
GitLab