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/SaveDialogs/SaveFileTroubleShooter.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/SaveDialogs/SaveFileTroubleShooter.cs')
| -rw-r--r-- | TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.cs b/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.cs index 4ada932..bcd60d1 100644 --- a/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.cs +++ b/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.cs @@ -14,9 +14,9 @@ namespace TimeHACK.SaveDialogs { public partial class SaveFileTroubleShooter : Form { - public String log; + public string log; Save savedata = new Save(); - String json; + string json; public SaveFileTroubleShooter() { InitializeComponent(); @@ -32,7 +32,7 @@ namespace TimeHACK.SaveDialogs BeginScan(); } - void WriteToLog(String toWrite) + void WriteToLog(string toWrite) { log += toWrite + Environment.NewLine; } |