Skip to content

Commit

Permalink
Merge branch '1.2.x' into 2.0.x
Browse files Browse the repository at this point in the history
# Conflicts:
#	azure-pipelines.yml
#	environment.yml
#	pyproject.toml
  • Loading branch information
j-ittner committed Sep 27, 2022
2 parents 006d0c5 + 4a4361f commit 3b93e2a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ schedules:
displayName: Nightly full build
branches:
include:
- 1.2.x
- 2.0.x

resources:
repositories:
Expand Down

0 comments on commit 3b93e2a

Please sign in to comment.