From 5bfa0d8184b94d22c8bd0cff404acae0ef210a3c Mon Sep 17 00:00:00 2001
From: Alex-TIMEHACK <alexbu2015@hotmail.com>
Date: Fri, 21 Jul 2017 18:15:51 +0100
Subject: Fixed stupid conflict...

---
 TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
index 15dcaad..bfacaa6 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
@@ -251,4 +251,3 @@ namespace TimeHACK.OS.Win95.Win95Apps
         }
     }
 }
->>>>>>> refs/remotes/TimeHACKDevs/master
-- 
cgit v1.2.3