diff options
| author | lempamo <[email protected]> | 2017-07-13 12:09:22 -0500 |
|---|---|---|
| committer | lempamo <[email protected]> | 2017-07-13 12:09:22 -0500 |
| commit | 80b07723bc8c5a320436a577f2d88ca71f6dc299 (patch) | |
| tree | 1662f0f38e88c1ba53a64f594243f7e4e6a93028 /TimeHACK.Main/OS/Win95/Win95Apps/AddressBook | |
| parent | a48b40e45536ee5c58d4d6a23bde0a9fc2b8ae3d (diff) | |
| parent | 22cca68c0de30099891c4cf275968e10b0494d9f (diff) | |
| download | histacom2-80b07723bc8c5a320436a577f2d88ca71f6dc299.tar.gz histacom2-80b07723bc8c5a320436a577f2d88ca71f6dc299.tar.bz2 histacom2-80b07723bc8c5a320436a577f2d88ca71f6dc299.zip | |
fix conflict in vs :D
Diffstat (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/AddressBook')
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.cs | 2 | ||||
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.cs | 4 |
2 files changed, 3 insertions, 3 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>(); } } |