chore(vscode): update to 1.54.2

2021-03-11 10:27:10 -07:00
parent 44a4a0bc20 e8cd17a97d
commit 0cd3e39492
1459 changed files with 53404 additions and 51004 deletions
--- a/lib/vscode/build/azure-pipelines/exploration-build.yml
+++ b/lib/vscode/build/azure-pipelines/exploration-build.yml
@@ -28,9 +28,9 @@ steps:
      git config user.name "VSCode"

      git checkout origin/electron-11.x.y
-      git merge origin/master
+      git merge origin/main

-      # Push master branch into exploration branch
+      # Push main branch into exploration branch
      git push origin HEAD:electron-11.x.y

    displayName: Sync & Merge Exploration