Resolucion conflictos

Maldonado Ramirez · Maldonado Ramirez · commit 81d9c05752c3 · 2022-10-18T13:05:15.000+02:00
diff --git a/src/main/java/com/tsystems/serverchat/manager/ThreadReader.java b/src/main/java/com/tsystems/serverchat/manager/ThreadReader.java
@@ -68,7 +68,7 @@ public void run()
      * @return text that has been readed from the socket
      * @throws IOException the socket can not be readed
      */
-    private void read(Socket client) throws IOException
+    public void read(Socket client) throws IOException
     {
         InputStream input;
         String text = "";

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public void run()`
`68`	`68`	`* @return text that has been readed from the socket`
`69`	`69`	`* @throws IOException the socket can not be readed`
`70`	`70`	`*/`
`71`		`- private void read(Socket client) throws IOException`
	`71`	`+ public void read(Socket client) throws IOException`
`72`	`72`	`{`
`73`	`73`	`InputStream input;`
`74`	`74`	`String text = "";`