remove merge conflict

TylerLeonhardt · TylerLeonhardt · commit b7aaae83692a · 2019-07-29T10:22:59.000-07:00
diff --git a/src/PowerShellEditorServices.Engine/Services/Workspace/LanguageServerSettings.cs b/src/PowerShellEditorServices.Engine/Services/Workspace/LanguageServerSettings.cs
@@ -178,10 +178,6 @@ public class CodeFormattingSettings
         /// </summary>>
         public CodeFormattingSettings()
         {
-<<<<<<< HEAD
-=======
-
->>>>>>> didChangeConfiguration message and general settings support
         }
 
         /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -178,10 +178,6 @@ public class CodeFormattingSettings`
`178`	`178`	`/// </summary>>`
`179`	`179`	`public CodeFormattingSettings()`
`180`	`180`	`{`
`181`		`-<<<<<<< HEAD`
`182`		`-=======`
`183`		`-`
`184`		`->>>>>>> didChangeConfiguration message and general settings support`
`185`	`181`	`}`
`186`	`182`
`187`	`183`	`/// <summary>`