From 4cf1950c7f58d67b5999fd459e6cb5c8941491da Mon Sep 17 00:00:00 2001
From: rojas <rojas@N619>
Date: Tue, 27 Aug 2024 11:44:13 -0700
Subject: [PATCH] Merge origin/master
Conflicts:
assignments/nbproject/project.properties
---
.../homework2/Romero/RomeroClientHW2.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/assignments/src/MV3500Cohort2024JulySeptember/homework2/Romero/RomeroClientHW2.java b/assignments/src/MV3500Cohort2024JulySeptember/homework2/Romero/RomeroClientHW2.java
index 382ceeb106..06a372d9f6 100644
--- a/assignments/src/MV3500Cohort2024JulySeptember/homework2/Romero/RomeroClientHW2.java
+++ b/assignments/src/MV3500Cohort2024JulySeptember/homework2/Romero/RomeroClientHW2.java
@@ -9,7 +9,6 @@ import java.time.DayOfWeek;
/**
* This client program establishes a socket connection to the {@link RomeroServerHW2},
* then checks how long it takes to read the single line it expects as a server response.
- * No fancy footwork here, it is pretty simple and similar to {@link TcpExample3Client}.
*
* @author Don McGregor
* @author Don Brutzman
--
GitLab