dave/eveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge fix

Browse Source
This commit is contained in:
Anton Kasyanov
2018-03-30 01:38:32 +03:00
parent 45c7123313
commit 29d8e51c70
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Eve-O-Preview/Configuration/ConfigurationStorage.cs
View File

@@ -1,5 +1,4 @@
using System; using System.IO;
using System.IO;
using Newtonsoft.Json; using Newtonsoft.Json;
namespace EveOPreview.Configuration namespace EveOPreview.Configuration
@@ -36,12 +35,8 @@ namespace EveOPreview.Configuration
public void Save() public void Save()
{ {
<<<<<<< HEAD
string rawData = JsonConvert.SerializeObject(this._thumbnailConfig, Formatting.Indented);
string filename = this.GetConfigFileName();
=======
string rawData = JsonConvert.SerializeObject(this._thumbnailConfiguration, Formatting.Indented); string rawData = JsonConvert.SerializeObject(this._thumbnailConfiguration, Formatting.Indented);
>>>>>>> develop string filename = this.GetConfigFileName();
try try
{ {