Trying to fix the conflicts

1 files changed, 0 insertions, 87 deletions

diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.cs
deleted file mode 100644
index 390614d..0000000
--- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using TimeHACK.Engine;
-
-namespace TimeHACK.OS.Win95.Win95Apps
-{
-    public partial class Win95Notepad : UserControl
-    {
-        public Win95Notepad()
-        {
-            InitializeComponent();
-            foreach (ToolStripMenuItem item in menuStrip1.Items)
-            {
-                item.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((0)));
-                item.BackColor = Color.Silver;
-                item.BackgroundImage = Properties.Resources.sliversilver;
-                item.BackgroundImageLayout = ImageLayout.Center;
-                item.DisplayStyle = ToolStripItemDisplayStyle.Text;
-            }
-        }
-
-        private void exitToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            this.ParentForm.Close();
-        }
-
-        private void aboutNotepadToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            WindowManager wm = new WindowManager();
-            wm.startAboutBox95("Notepad", "Microsoft Notepad", Properties.Resources.WinClassicNotepad);
-        }
-
-        private void wordWrapToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            mainText.WordWrap = wordWrapToolStripMenuItem.Checked;
-        }
-
-        private void selectAllToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            mainText.SelectAll();
-        }
-
-        private void undoToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            mainText.Undo();
-        }
-
-        private void cutToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            if (mainText.SelectedText.Length >= 0)
-            {
-                mainText.Cut();
-            }
-        }
-
-        private void copyToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            if (mainText.SelectedText.Length >= 0)
-            {
-                mainText.Copy();
-            }
-        }
-
-        private void pasteToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            mainText.Paste();
-        }
-
-        private void deleteToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            mainText.Text.Remove(mainText.SelectionStart, mainText.SelectedText.Length);
-        }
-
-        private void timeDateToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            string DateTime = System.DateTime.Now.ToString("HH:mm tt dd/MM/yyyy");
-            mainText.AppendText(DateTime);
-        }
-    }
-}