Merge pull request #4 from actions/master

Integrate master changes to main branch
5 years ago · 149df221c7
parent 35de4ce5f5 b34c795b2c
commit 149df221c7
3 changed files with 3 additions and 3 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,4 +1,4 @@
 [submodule "helpers"]
 	path = helpers
 	url = https://github.com/actions/versions-package-tools
-	branch = master
+	branch = main
--- a/azure-pipelines/build-go-packages.yml
+++ b/azure-pipelines/build-go-packages.yml
@ -4,7 +4,7 @@ pr:
  autoCancel: true
  branches:
    include:
-    - master
+    - main
  paths:
    exclude:
    - versions-manifest.json
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 350e2888aa8ba786f16e7e37479c41551326d25c
+Subproject commit 1069e7a4ece355bd321909454fc1f9f7244eb03b
		`@ -1 +1 @@`
			`Subproject commit 350e2888aa8ba786f16e7e37479c41551326d25c`				`Subproject commit 1069e7a4ece355bd321909454fc1f9f7244eb03b`