fmartingr/mattermost-plugin-attachments-remover
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bad merge (#126)

Browse source
This commit is contained in:
Ben Schumacher 2020-09-17 02:36:58 +02:00 • committed by GitHub
parent 511805e36c
commit eae9f9826a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.editorconfig
View file

@ -25,4 +25,3 @@ indent_style = tab
indent_style = space indent_style = space
indent_size = 4 indent_size = 4
trim_trailing_whitespace = false trim_trailing_whitespace = false

4
build/manifest/main.go
View file

@ -123,7 +123,6 @@ func applyManifest(manifest *model.Manifest) error {
return err return err
} }
manifestStr := string(manifestBytes) manifestStr := string(manifestBytes)
manifestStr = strings.ReplaceAll(manifestStr, "\\n", "\\\n")
// write generated code to file by using Go file template. // write generated code to file by using Go file template.
if err := ioutil.WriteFile( if err := ioutil.WriteFile(
@ -145,6 +144,9 @@ func applyManifest(manifest *model.Manifest) error {
} }
manifestStr := string(manifestBytes) manifestStr := string(manifestBytes)
// Escape newlines
manifestStr = strings.ReplaceAll(manifestStr, `\n`, `\\n`)
// write generated code to file by using JS file template. // write generated code to file by using JS file template.
if err := ioutil.WriteFile( if err := ioutil.WriteFile(
"webapp/src/manifest.ts", "webapp/src/manifest.ts",