1 files changed, 0 insertions, 48 deletions
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs
index c0e1bc4..0fac91a 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs
@@ -5,8 +5,6 @@ using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using TimeHACK.Engine;
 using TimeHACK.Engine.Template;
-using TimeHACK.Resources.IE4;
-
 namespace TimeHACK.OS.Win95.Win95Apps
 {
     public partial class WinClassicIE4 : UserControl
@@ -14,8 +12,6 @@ namespace TimeHACK.OS.Win95.Win95Apps
         public List<string> browsinghistory = new List<string>();
         public int historylocation = 0;
 
-        IE4Welcome welcomeinternetscreen = new IE4Welcome();
-
         public WinClassicIE4()
         {
             InitializeComponent();
@@ -23,19 +19,13 @@ namespace TimeHACK.OS.Win95.Win95Apps
 
         private void WinClassicIE4_Load(object sender, EventArgs e)
         {
-<<<<<<< HEAD
             browsinghistory.Capacity = 99;
             BringToFront();
             hidePrograms();
-            welcomeinternetscreen.Dock = DockStyle.Fill;
-            welcomeinternetscreen.Show();
             browsinghistory.Add("www.microsoft.com/internetexplorer4/welcome");
             for (int i = 0; i < 99; i++) browsinghistory.Add(null);
             foreach (ToolStripMenuItem item in MenuStrip3.Items) item.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((0)));
             foreach (Control ctrl in Panel1.Controls) ctrl.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((0)));
-=======
-            
->>>>>>> origin/master
         }
 
         private void hidePrograms()
@@ -43,7 +33,6 @@ namespace TimeHACK.OS.Win95.Win95Apps
             googlemain.Hide();
             googleprototype.Hide();
             googlealpha.Hide();
-            welcomeinternetscreen.Hide();
             padamsmain.Hide();
             hotmailmain.Hide();
             padamsbackgrounds.Hide();
@@ -75,8 +64,6 @@ namespace TimeHACK.OS.Win95.Win95Apps
                     break;
                 case "www.microsoft.com/internetexplorer4/welcome":
                     hidePrograms();
-                    welcomeinternetscreen.Dock = DockStyle.Fill;
-                    welcomeinternetscreen.Show();
                     break;
                 case "www.???.com":
                     hidePrograms();
@@ -143,42 +130,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
         {
             goToSite(addressbar.Text, false);
         }
-<<<<<<< HEAD
-
-=======
-        
-        private void webBrowser1_DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e)
-        {
-            loadplz.Start();
-        }
-
-        private void loadplz_Tick(object sender, EventArgs e)
-        {
-            try
-            {
-                switch (currentsite.Title)
-                {
-                    case "IE4START":
-                        webBrowser1.Document.GetElementById("google").Click += new HtmlElementEventHandler(google_LinkClicked);
-                        webBrowser1.Document.GetElementById("padams").Click += new HtmlElementEventHandler(padams_LinkClicked);
-                        break;
-                    case "12PADAMS":
-                        webBrowser1.Document.GetElementById("wc_b").Click += new HtmlElementEventHandler(WCDownloadButton_Click);
-                        if (!TitleScreen.frm95.hiddenpadamsFound) webBrowser1.Document.GetElementById("distort").Style += "visibility:hidden;";
-                        break;
-                    case "GOOGLE":
-                        webBrowser1.Document.GetElementById("prototype").Click += new HtmlElementEventHandler(googleprototypelink_LinkClicked);
-                        webBrowser1.Document.GetElementById("alpha").Click += new HtmlElementEventHandler(googlebetalink_LinkClicked);
-                        break;
-                }
-                loadplz.Stop();
-            } catch
-            {
-
-            }
-        }
         
->>>>>>> origin/master
         //TODO: Add more websites
         //TODO: Relabel Buttons And Things
     }