Correct merge conflict errors

rubberduck-vba · Jun 3, 2019 · a2139a2 · a2139a2
1 parent 0ec32a0
commit a2139a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/Rubberduck.SettingsProvider/Facade/ConfigurationServiceBase.cs b/Rubberduck.SettingsProvider/Facade/ConfigurationServiceBase.cs
@@ -14,7 +14,7 @@ public class ConfigurationServiceBase<T> : IConfigurationService<T>
 
         public ConfigurationServiceBase(IPersistenceService<T> persister, IDefaultSettings<T> defaultSettings)
         {
-            this._persister = persister;
+            _persister = persister;
             Defaults = defaultSettings;
         }
 
@@ -33,7 +33,7 @@ protected T LoadCacheValue()
                 if (CurrentValue == null)
                 {
                     T defaults = ReadDefaults();
-                    T newValue = persister.Load() ?? defaults;
+                    T newValue = _persister.Load() ?? defaults;
                     CurrentValue = newValue;
                 }
                 return CurrentValue;
@@ -68,15 +68,15 @@ public virtual void Save(T settings)
 
         public virtual T Import(string path)
         {
-            T loaded = persister.Load(path);
+            T loaded = _persister.Load(path);
             Save(loaded);
             return Read();
         }
 
         public virtual void Export(string path)
         {
             T current = Read();
-            persister.Save(current, path);
+            _persister.Save(current, path);
         }
     }
 }
diff --git a/Rubberduck.SettingsProvider/Persistence/XmlPersistenceService.cs b/Rubberduck.SettingsProvider/Persistence/XmlPersistenceService.cs
@@ -62,8 +62,6 @@ protected override void Write(T toSerialize, string path)
                 }
             }
 
-            EnsurePathExists(path);
-
             using (var xml = XmlWriter.Create(path, OutputXmlSettings))
             {
                 doc.WriteTo(xml);