sem/Proftaak-RH-B4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conflicts yay

Browse Source
This commit is contained in:
Sem van der Hoeven
2020-09-18 14:25:21 +02:00
parent 0d107a7170
commit 3d72ed9694
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
RH-Engine/Program.cs
View File

@@ -13,22 +13,15 @@ namespace RH_Engine
internal class Program internal class Program
{ {
private static PC[] PCs = { private static PC[] PCs = {
<<<<<<< HEAD
new PC("DESKTOP-TV73FK0", "woute"), new PC("DESKTOP-TV73FK0", "woute"),
//new PC("DESKTOP-M2CIH87", "Fabian"), //new PC("DESKTOP-M2CIH87", "Fabian"),
//new PC("T470S", "Shinichi"), //new PC("T470S", "Shinichi"),
//new PC("DESKTOP-DHS478C", "semme"), //new PC("DESKTOP-DHS478C", "semme"),
new PC("NA", "Ralf"), new PC("NA", "Ralf"),
new PC("NA", "Bart") }; 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) private static void Main(string[] args)
{ {
TcpClient client = new TcpClient("145.48.6.10", 6666); TcpClient client = new TcpClient("145.48.6.10", 6666);