From 8d98f3bcef7246d95d038453e5d3f46404adb7c5 Mon Sep 17 00:00:00 2001
From: Tobias <tobias.brennenstuhl.gy@nps.edu>
Date: Mon, 22 Jul 2019 10:46:31 -0700
Subject: [PATCH] Merge origin/master
Conflicts:
assignments/ReportingForDuty.md
---
.../homework1/KNOBELOCH_TcpExample1Telnet.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework1/KNOBELOCH_TcpExample1Telnet.java b/assignments/src/MV3500Cohort2019JulySeptember/homework1/KNOBELOCH_TcpExample1Telnet.java
index a961f285e5..f36c1c43a7 100644
--- a/assignments/src/MV3500Cohort2019JulySeptember/homework1/KNOBELOCH_TcpExample1Telnet.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/homework1/KNOBELOCH_TcpExample1Telnet.java
@@ -53,7 +53,7 @@ public class KNOBELOCH_TcpExample1Telnet
PrintStream ps = new PrintStream(os);
//ps.println("This client response was written by server TcpExample1."); // to remote clientnc
- ps.println("42");
+ ps.println("42 IS WRONG! CHUCK NORRIS IS ALWAYS RIGHT!");
//System.out.println("This server response was written by server TcpExample1."); // to server console
System.out.println("42 IS WRONG! CHUCK NORRIS IS ALWAYS RIGHT!");
--
GitLab