Commit ce4d3fc
committed
Merge branch 'release/0.3.0' into develop
# Conflicts:
# environments/py-3.10-linux-64-dev.conda.lock.yml
# environments/py-3.10-linux-64.conda.lock.yml
# environments/py-3.10-win-64-dev.conda.lock.yml
# environments/py-3.10-win-64.conda.lock.yml
# environments/py-3.11-linux-64-dev.conda.lock.yml
# environments/py-3.11-linux-64.conda.lock.yml
# environments/py-3.11-win-64-dev.conda.lock.yml
# environments/py-3.11-win-64.conda.lock.yml
# environments/py-3.12-linux-64-dev.conda.lock.yml
# environments/py-3.12-linux-64.conda.lock.yml
# environments/py-3.12-win-64-dev.conda.lock.yml
# environments/py-3.12-win-64.conda.lock.yml
# py-3.10.conda-lock.yml
# py-3.11.conda-lock.yml
# py-3.12.conda-lock.yml
# pyproject.toml
# recipe.yaml
# simpeg_drivers/__init__.py3 files changed
Lines changed: 10 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
355 | 355 | | |
356 | 356 | | |
357 | 357 | | |
358 | | - | |
| 358 | + | |
359 | 359 | | |
360 | 360 | | |
361 | 361 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
33 | | - | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
34 | 36 | | |
35 | | - | |
| 37 | + | |
36 | 38 | | |
37 | 39 | | |
38 | 40 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
63 | | - | |
64 | | - | |
65 | | - | |
66 | | - | |
67 | | - | |
| 63 | + | |
68 | 64 | | |
69 | 65 | | |
70 | 66 | | |
| |||
79 | 75 | | |
80 | 76 | | |
81 | 77 | | |
82 | | - | |
83 | | - | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
84 | 82 | | |
85 | 83 | | |
86 | 84 | | |
| |||
0 commit comments