Skip to content

Commit

Permalink
Merge branch 'devel' into OBC_for_OPLS
Browse files Browse the repository at this point in the history
  • Loading branch information
martimunicoy committed Nov 17, 2020
2 parents fc968e7 + 3327191 commit cff0e0b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: goanpeca/setup-miniconda@v1
- uses: conda-incubator/setup-miniconda@v2
name: Conda setup
with:
python-version: 3.7
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: goanpeca/setup-miniconda@v1
- uses: conda-incubator/setup-miniconda@v2
name: Conda setup
with:
python-version: ${{ matrix.python-version }}
Expand Down

0 comments on commit cff0e0b

Please sign in to comment.