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/Program.cs | |
| 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/Program.cs')
| -rw-r--r-- | TimeHACK.Main/Program.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/TimeHACK.Main/Program.cs b/TimeHACK.Main/Program.cs index e2a4be6..3f8d10c 100644 --- a/TimeHACK.Main/Program.cs +++ b/TimeHACK.Main/Program.cs @@ -51,7 +51,7 @@ namespace TimeHACK //TimeHACK.Engine.GameSave.SaveData MySaveData = new TimeHACK.Engine.GameSave.SaveData() //{ // OS = 60, - // MyStringList = new List<string> + // MystringList = new List<string> // { // "Item1", // "Item2" @@ -69,7 +69,7 @@ namespace TimeHACK Application.Run(title); } - public static String OpenFileExplorerAsDialogAndReturnGivenPath() + public static string OpenFileExplorerAsDialogAndReturnGivenPath() { WinClassicWindowsExplorer we = new WinClassicWindowsExplorer(); |