Skip to content

Commit

Permalink
Merge pull request #1812 from swiftwasm/maxd/pull-main
Browse files Browse the repository at this point in the history
Pull from the `main` upstream branch
  • Loading branch information
MaxDesiatov authored Sep 24, 2020
2 parents 82e8a18 + 3d71e6f commit 60b22ce
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .github/pull.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
version: "1"
rules:
- base: swiftwasm
upstream: master
upstream: main
mergeMethod: merge
- base: master
upstream: apple:master
- base: main
upstream: apple:main
mergeMethod: hardreset
- base: release/5.3
upstream: apple:release/5.3
Expand Down

0 comments on commit 60b22ce

Please sign in to comment.