Skip to content

Commit f866980

Browse files
committed
resolve merge conflicts with main
2 parents 077c9c8 + aee69af commit f866980

File tree

293 files changed

+20206
-6835
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

293 files changed

+20206
-6835
lines changed

.azure-pipelines/linux-CI-nightly.yml

Lines changed: 0 additions & 66 deletions
This file was deleted.

.azure-pipelines/linux-conda-CI.yml

Lines changed: 0 additions & 164 deletions
This file was deleted.

.azure-pipelines/win32-CI-nightly.yml

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)