diff options
| author | Alex-TIMEHACK <[email protected]> | 2017-07-21 18:15:51 +0100 |
|---|---|---|
| committer | Alex-TIMEHACK <[email protected]> | 2017-07-21 18:15:51 +0100 |
| commit | 5bfa0d8184b94d22c8bd0cff404acae0ef210a3c (patch) | |
| tree | 2c12c787f2f6f98fc98c1a3859e83a050135f933 /TimeHACK.Main | |
| parent | 691ee07670cc1255004e33761b188c4944ca936d (diff) | |
| download | histacom2-5bfa0d8184b94d22c8bd0cff404acae0ef210a3c.tar.gz histacom2-5bfa0d8184b94d22c8bd0cff404acae0ef210a3c.tar.bz2 histacom2-5bfa0d8184b94d22c8bd0cff404acae0ef210a3c.zip | |
Fixed stupid conflict...
Diffstat (limited to 'TimeHACK.Main')
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 1 |
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 |