Merge remote-tracking branch 'origin/master'

PanDAWMS · Apr 28, 2022 · 594a52e · 594a52e
2 parents 7d88e2b + 053ffd4
commit 594a52e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/condapublish.yml b/.github/workflows/condapublish.yml
@@ -42,8 +42,8 @@ jobs:
           cd dst
           git remote add upstream https://github.com/conda-forge/${REPO_NAME}-feedstock.git
           git fetch upstream
-          git checkout master
-          git merge upstream/master
+          git checkout main
+          git merge upstream/main
 
       # Generate meta.yaml
       - name: Generate and push meta.yaml