Fix: Resolving Git Merge Conflicts #253

Merged
j.kropff merged 69 commits from chore/ui-checkstyle-fixes into main 2026-04-11 15:10:58 +02:00
Showing only changes of commit df31c307fe - Show all commits
@@ -19,10 +19,11 @@ public class ChatControllerTest {
public void teardown() { public void teardown() {
} }
/*
@Test * @Test
public void testChatController() { * public void testChatController() {
Client client = new Client("user1"); * Client client = new Client("user1");
client.startApplication(); * client.startApplication();
} * }
*/
} }