aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs1
1 files changed, 0 insertions, 1 deletions
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