fix rebase

Author: carlos-zamora

src/cascadia/TerminalSettingsModel/CascadiaSettings.h

@@ -266,7 +266,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     public:
         FragmentSettings(hstring source, hstring json, hstring filename) :
             _source{ source },
-            _json{ json },
+            _Json{ json },
             _filename{ filename } {}
 
         hstring Source() const noexcept { return _source; }

src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp

@@ -192,7 +192,7 @@ void SettingsLoader::GenerateProfiles()
                 PowershellInstallationProfileGenerator pwshInstallationGenerator{};
                 _executeGenerator(pwshInstallationGenerator);
             }
-            
+
             // Regardless of running the installer's generator, we need to do some cleanup still.
             _cleanupPowerShellInstaller(isPowerShellInstalled);
         }