From 16eb71e2001f3dc2a3cc129f66d66db16c90ab9a Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <christoph.bergmeister@bjss.com>
Date: Wed, 2 Oct 2019 23:01:10 +0100
Subject: [PATCH] Fix 'git cherry-pick' merge error

---
 .../Server/LanguageServerSettings.cs                             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs b/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs
index 6106fb25c..2c1d0b7df 100644
--- a/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs
+++ b/src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs
@@ -264,6 +264,7 @@ private Hashtable GetCustomPSSASettingsHashtable(int tabSize, bool insertSpaces)
                 {"PSUseConsistentIndentation", new Hashtable {
                     {"Enable", true},
                     {"IndentationSize", tabSize},
+                    {"PipelineIndentation", PipelineIndentationStyle },
                     {"Kind", insertSpaces ? "space" : "tab"}
                 }},
                 {"PSUseConsistentWhitespace", new Hashtable {