Merge fix

Phrynohyas · Mar 29, 2018 · 29d8e51 · 29d8e51
1 parent 45c7123
commit 29d8e51
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/Eve-O-Preview/Configuration/ConfigurationStorage.cs b/Eve-O-Preview/Configuration/ConfigurationStorage.cs
@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 using Newtonsoft.Json;
 
 namespace EveOPreview.Configuration
@@ -36,12 +35,8 @@ public void Load()
 
 		public void Save()
 		{
-<<<<<<< HEAD
-			string rawData = JsonConvert.SerializeObject(this._thumbnailConfig, Formatting.Indented);
-			string filename = this.GetConfigFileName();
-=======
 			string rawData = JsonConvert.SerializeObject(this._thumbnailConfiguration, Formatting.Indented);
->>>>>>> develop
+			string filename = this.GetConfigFileName();
 
 			try
 			{