shiftos-archive/Histacom2
1
0
Fork 0
mirror of https://github.com/HistacomUnity/Histacom2-old.git synced 2025-01-22 17:12:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed stupid conflict...

Browse source
This commit is contained in:
Alex-TIMEHACK 2017-07-21 18:15:51 +01:00
parent 691ee07670
commit 5bfa0d8184
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
View file

@ -251,4 +251,3 @@ private void Button4_Click(object sender, EventArgs e)
}
}
}
>>>>>>> refs/remotes/TimeHACKDevs/master