Skip to content

Commit 54a53bb

Browse files
author
Robert Holt
committed
Merge branch 'master' of https://github.com/rjmholt/PowerShellEditorServices into logging-serilog
2 parents fb7fc0f + b465f3e commit 54a53bb

File tree

3 files changed

+36
-0
lines changed

3 files changed

+36
-0
lines changed

.editorconfig

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# EditorConfig is awesome: http://EditorConfig.org
2+
3+
# top-most EditorConfig file
4+
root = true
5+
6+
[*]
7+
indent_style = space
8+
insert_final_newline = true
9+
10+
[*.{cs}]
11+
indent_size = 4
12+
trim_trailing_whitespace = true
13+
14+
[*.{json}]
15+
indent_size = 2
16+
trim_trailing_whitespace = true
17+
18+
[*.{ps1,psm1,psd1}]
19+
indent_size = 4
20+
trim_trailing_whitespace = true
21+
22+
[*.{ps1xml,props,xml,yaml}]
23+
indent_size = 2

.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
CHANGELOG.md merge=union
2+
* text=auto
3+
*.png binary

.vscode/extensions.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
// See http://go.microsoft.com/fwlink/?LinkId=827846
3+
// for the documentation about the extensions.json format
4+
"recommendations": [
5+
"ms-vscode.csharp",
6+
"ms-vscode.PowerShell",
7+
"EditorConfig.EditorConfig",
8+
"DavidAnson.vscode-markdownlint"
9+
]
10+
}

0 commit comments

Comments
 (0)