aboutsummaryrefslogtreecommitdiff
path: root/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
diff options
context:
space:
mode:
Diffstat (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs')
-rw-r--r--TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
index bfacaa6..15dcaad 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
@@ -251,3 +251,4 @@ namespace TimeHACK.OS.Win95.Win95Apps
}
}
}
+>>>>>>> refs/remotes/TimeHACKDevs/master