Merge pull request #333 from christian-bromann/cb-default-branch

Rename default branch from `master` to `main`
editorconfig · Apr 6, 2022 · 6c06c70 · 6c06c70
2 parents 2fa2f29 + fb44b8e
commit 6c06c70
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
@@ -1 +1 @@
-### Please refer to the [EditorConfig Code of Conduct](https://github.com/editorconfig/editorconfig/blob/master/CODE_OF_CONDUCT.md).
+### Please refer to the [EditorConfig Code of Conduct](https://github.com/editorconfig/editorconfig/blob/main/CODE_OF_CONDUCT.md)
diff --git a/.github/workflows/master.yml → .github/workflows/test.yml b/.github/workflows/master.yml → .github/workflows/test.yml
@@ -3,10 +3,10 @@ name: Node CI
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
-      - master
+      - main
 
 jobs:
   test:
@@ -42,7 +42,7 @@ jobs:
           npm test
         env:
           CI: true
-          DISPLAY: ':99.0'
+          DISPLAY: ":99.0"
 
   release:
     name: vsce publish

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -230,7 +230,7 @@
 ## 0.3.4
 
 - [Use
-  `onWillSaveTextDocument`]https://github.com/editorconfig/editorconfig-vscode/pull/80,
+  `onWillSaveTextDocument`]<https://github.com/editorconfig/editorconfig-vscode/pull/80>,
   fixes [`#76`](https://github.com/editorconfig/editorconfig-vscode/issues/76)
   and [`#79`](https://github.com/editorconfig/editorconfig-vscode/issues/79)
   (thanks [`@SamVerschueren`](https://github.com/SamVerschueren))!
@@ -260,7 +260,7 @@
 
 - [Fix applying transformations to .editorconfig itself](https://github.com/editorconfig/editorconfig-vscode/issues/9)
   (thanks [`@SamVerschueren`](https://github.com/SamVerschueren))!
-- [Fix marketplace icon](https://github.com/editorconfig/editorconfig-vscode/commits/master)
+- [Fix marketplace icon](https://github.com/editorconfig/editorconfig-vscode/commits/main)
   (thanks [`@SamVerschueren`](https://github.com/SamVerschueren))!
 
 ## 0.2.2

diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
     "config",
     "multi-root ready"
   ],
-  "homepage": "https://github.com/editorconfig/editorconfig-vscode/blob/master/README.md",
+  "homepage": "https://github.com/editorconfig/editorconfig-vscode/blob/main/README.md",
   "repository": {
     "type": "git",
     "url": "https://github.com/editorconfig/editorconfig-vscode.git"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		### Please refer to the [EditorConfig Code of Conduct](https://github.com/editorconfig/editorconfig/blob/master/CODE_OF_CONDUCT.md).
		### Please refer to the [EditorConfig Code of Conduct](https://github.com/editorconfig/editorconfig/blob/main/CODE_OF_CONDUCT.md)