From 3d72ed9694649630954f0c7a18851e9e7e73e787 Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Fri, 18 Sep 2020 14:25:21 +0200 Subject: [PATCH] conflicts yay --- RH-Engine/Program.cs | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/RH-Engine/Program.cs b/RH-Engine/Program.cs index 5099892..de7bda8 100644 --- a/RH-Engine/Program.cs +++ b/RH-Engine/Program.cs @@ -13,22 +13,15 @@ namespace RH_Engine internal class Program { private static PC[] PCs = { -<<<<<<< HEAD + new PC("DESKTOP-TV73FK0", "woute"), //new PC("DESKTOP-M2CIH87", "Fabian"), //new PC("T470S", "Shinichi"), //new PC("DESKTOP-DHS478C", "semme"), new PC("NA", "Ralf"), new PC("NA", "Bart") }; -======= - //new PC("DESKTOP-M2CIH87", "Fabian"), - //new PC("T470S", "Shinichi"), - new PC("DESKTOP-DHS478C", "semme"), - //new PC("DESKTOP-TV73FKO", "Wouter"), - //new PC("NA", "Ralf"), - //new PC("NA", "Bart") - }; ->>>>>>> 8fd3322c63830c7f5cc7668ffd49e8203dbe1a95 + + private static void Main(string[] args) { TcpClient client = new TcpClient("145.48.6.10", 6666);