Fixed Conflicts

1 files changed, 20 insertions, 0 deletions

diff --git a/TimeHACK.Main/OS/Win98/Win98.cs b/TimeHACK.Main/OS/Win98/Win98.cs
new file mode 100644
index 0000000..b3b5f99
--- /dev/null
+++ b/TimeHACK.Main/OS/Win98/Win98.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace TimeHACK.OS.Win98
+{
+    public partial class Win98 : Form
+    {
+        public Win98()
+        {
+            InitializeComponent();
+        }
+    }
+}