Commit 10d305c

authored

Merge pull request #22192 from meeseeksmachine/auto-backport-of-pr-22190-on-v3.5.x

Backport PR #22190 on branch v3.5.x (DOC: Fix upstream URL for merge in CircleCI)

2 parents 60f98e1 + a7141fd commit 10d305cCopy full SHA for 10d305c

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ commands:`
`28`	`28`	`name: Merge with upstream`
`29`	`29`	`command: \|`
`30`	`30`	`if ! git remote -v \| grep upstream; then`
`31`		`- git remote add upstream git://github.com/matplotlib/matplotlib.git`
	`31`	`+ git remote add upstream https://github.com/matplotlib/matplotlib.git`
`32`	`32`	`fi`
`33`	`33`	`git fetch upstream`
`34`	`34`	`if [[ "$CIRCLE_BRANCH" != "master" ]] && \`

Comments

(0)