From eae9f9826a5e6c626978f378687be05d7b10f83b Mon Sep 17 00:00:00 2001
From: Ben Schumacher <ben.schumacher@mattermost.com>
Date: Thu, 17 Sep 2020 02:36:58 +0200
Subject: [PATCH] Fix bad merge (#126)

---
 .editorconfig          | 1 -
 build/manifest/main.go | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 24bfbba..a517dca 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -25,4 +25,3 @@ indent_style = tab
 indent_style = space
 indent_size = 4
 trim_trailing_whitespace = false
-
diff --git a/build/manifest/main.go b/build/manifest/main.go
index 87a5b20..14e6f4f 100644
--- a/build/manifest/main.go
+++ b/build/manifest/main.go
@@ -123,7 +123,6 @@ func applyManifest(manifest *model.Manifest) error {
 			return err
 		}
 		manifestStr := string(manifestBytes)
-		manifestStr = strings.ReplaceAll(manifestStr, "\\n", "\\\n")
 
 		// write generated code to file by using Go file template.
 		if err := ioutil.WriteFile(
@@ -145,6 +144,9 @@ func applyManifest(manifest *model.Manifest) error {
 		}
 		manifestStr := string(manifestBytes)
 
+		// Escape newlines
+		manifestStr = strings.ReplaceAll(manifestStr, `\n`, `\\n`)
+
 		// write generated code to file by using JS file template.
 		if err := ioutil.WriteFile(
 			"webapp/src/manifest.ts",