fix conflict in vs :D

5 files changed, 18 insertions, 18 deletions

diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.cs b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.cs
index fe75e83..482d54c 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.cs
@@ -57,7 +57,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
                 txtLast.Text = toSet.LastName;
                 if (toSet.Emails != null)
                 {
-                    foreach (String email in toSet.Emails)
+                    foreach (string email in toSet.Emails)
                     {
                         emails.Items.Add(email);
                     }
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.cs b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.cs
index 24404bf..95ee509 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.cs
@@ -282,12 +282,12 @@ namespace TimeHACK.OS.Win95.Win95Apps
         public string FirstName;
         public string MiddleName;
         public string LastName;
-        public List<String> Emails = new List<String>();
+        public List<string> Emails = new List<string>();
     }
 
     public class AddressBookContactList
     {
-        public String AttachedNode;
+        public string AttachedNode;
         public List<AddressBookContact> Contacts = new List<AddressBookContact>();
     }
 }
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs
index 70cd0f9..a754ed0 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs
@@ -71,7 +71,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
         /// Write text to the Terminal. Very similar to the Win32 Console.Write Function.
         /// </summary>
         /// <param name="Text"></param>
-        public void Write(String Text)
+        public void Write(string Text)
         {
             cmdPrompt.AppendText(Text);
             cmdPrompt.Update();
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs
index e4f98ff..98dc4ff 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs
@@ -45,9 +45,9 @@ namespace TimeHACK.OS.Win95.Win95Apps
         //'    Next
         //'End Sub
 
-        String ReadDataFile(String reqDirectory, Boolean returnYesIfProtected = false) {
-            String Val = "";
-            String directoryFileInfo;
+        string ReadDataFile(string reqDirectory, bool returnYesIfProtected = false) {
+            string Val = "";
+            string directoryFileInfo;
             directoryFileInfo = File.ReadAllText(Path.Combine(reqDirectory, "_data.info"));
             FileSystemFolderInfo toRead = new FileSystemFolderInfo();
             toRead = JsonConvert.DeserializeObject<FileSystemFolderInfo>(directoryFileInfo);
@@ -70,14 +70,14 @@ namespace TimeHACK.OS.Win95.Win95Apps
             try {
                 // Refresh the right listview
                 this.mainView.Items.Clear();
-                // For Each drive As String In My.Computer.FileSystem.GetDirectories(GameMain.MyDocuments & "\HistacomVB\" & GameMain.SaveProfile & "\HistacomVB\Folders")
+                // For Each drive As string In My.Computer.FileSystem.GetDirectories(GameMain.MyDocuments & "\HistacomVB\" & GameMain.SaveProfile & "\HistacomVB\Folders")
                 //    If GetPropetiesForDir(drive)(4) = "isMyDocuments" Then
                 //        diskView.Items.Add("", 0)
                 //    End If
                 //Next
-                foreach (String str in Directory.GetDirectories(currentDirectory))
+                foreach (string str in Directory.GetDirectories(currentDirectory))
                 {
-                    String label = ReadDataFile(str, false);
+                    string label = ReadDataFile(str, false);
                     if (label == "")
                     {
                         this.mainView.Items.Add(Path.GetFileName(str));
@@ -87,7 +87,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
                         this.mainView.FindItemWithText(label).Tag = Path.GetFileName(str);
                     }
                 }
-                foreach (String str in Directory.GetFiles(currentDirectory))
+                foreach (string str in Directory.GetFiles(currentDirectory))
                 {
                     // Get app Icon
 
@@ -96,7 +96,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
                     switch (new FileInfo(str).Extension)
                     {
                         case ".exe":
-                            String contents;
+                            string contents;
 
                             contents = File.ReadAllText(str);
 
@@ -492,7 +492,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
         {
             try
             {
-                if ((String)mainView.FocusedItem.Tag != "") { // If it isn't a file
+                if ((string)mainView.FocusedItem.Tag != "") { // If it isn't a file
                     GoToDir(currentDirectory + "\\" + mainView.FocusedItem.Tag);
                 } else { // If it is a file
                     if (new FileInfo(Path.Combine(currentDirectory, txtSave.Text)).Extension == onlyViewExtension)
@@ -547,10 +547,10 @@ namespace TimeHACK.OS.Win95.Win95Apps
         {
             try
             {
-                Boolean OpenFile = false;
+                bool OpenFile = false;
                 if (mainView.FocusedItem != null)
                 {
-                    if ((String)mainView.FocusedItem.Tag != "")
+                    if ((string)mainView.FocusedItem.Tag != "")
                     { // If it isn't a file
                         GoToDir(currentDirectory + "\\" + mainView.FocusedItem.Tag);
                     }
@@ -632,7 +632,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
         private void mainView_AfterLabelEdit(object sender, LabelEditEventArgs e)
         {
 
-            String setText;
+            string setText;
             setText = mainView.FocusedItem.Text;
             if (setText == "")
             {
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs
index bf0cb16..2453abc 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs
@@ -155,7 +155,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
 
         void SetSelectedTextFont(string font)
         {
-            // The next two lines convert a String to a Font
+            // The next two lines convert a string to a Font
             var cvt = new FontConverter();
             Font f = cvt.ConvertFromString(font) as Font;
 
@@ -164,7 +164,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
 
         void SetSelectedTextSize(string size)
         {
-            //  The next few lines will ATTEMPT to convert a String to an Integer
+            //  The next few lines will ATTEMPT to convert a string to an Integer
             int SizeInt = Convert.ToInt32(size);
 
             mainText.SelectionFont = new Font(mainText.SelectionFont.FontFamily, SizeInt, mainText.SelectionFont.Style);