Skip to content

Commit

Permalink
Merge branch '2.1.x' into 2.2.x
Browse files Browse the repository at this point in the history
# Conflicts:
#	azure-pipelines.yml
  • Loading branch information
j-ittner committed Oct 20, 2023
2 parents a0bb2c0 + 382bb5c commit 771601d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ or have a look at
.. |pypi| image:: https://badge.fury.io/py/sklearndf.svg
:target: https://pypi.org/project/sklearndf/

.. |azure_build| image:: https://dev.azure.com/gamma-facet/facet/_apis/build/status/BCG-X-Official.sklearndf?repoName=BCG-Gamma%2Fsklearndf&branchName=develop
.. |azure_build| image:: https://dev.azure.com/gamma-facet/facet/_apis/build/status/BCG-X-Official.sklearndf?repoName=BCG-X-Official%2Fsklearndf&branchName=develop
:target: https://dev.azure.com/gamma-facet/facet/_build?definitionId=8&_a=summary

.. |azure_code_cov| image:: https://img.shields.io/azure-devops/coverage/gamma-facet/facet/8/2.1.x
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ resources:
repositories:
- repository: pytools
type: github
endpoint: BCG-Gamma
name: BCG-Gamma/pytools
endpoint: BCG-X-Official
name: BCG-X-Official/pytools
ref: 2.1.x

variables:
Expand Down

0 comments on commit 771601d

Please sign in to comment.