Commit 13ac913
committed
Merge branch 'develop' into GEOPY-2715
# Conflicts:
# 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
# environments/py-3.13-linux-64-dev.conda.lock.yml
# environments/py-3.13-linux-64.conda.lock.yml
# environments/py-3.13-win-64-dev.conda.lock.yml
# environments/py-3.13-win-64.conda.lock.yml
# environments/py-3.14-linux-64-dev.conda.lock.yml
# environments/py-3.14-linux-64.conda.lock.yml
# environments/py-3.14-win-64-dev.conda.lock.yml
# environments/py-3.14-win-64.conda.lock.yml
# py-3.12.conda-lock.yml
# py-3.13.conda-lock.yml
# py-3.14.conda-lock.yml1 file changed
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
78 | 78 | | |
79 | 79 | | |
80 | 80 | | |
81 | | - | |
| 81 | + | |
82 | 82 | | |
83 | 83 | | |
84 | 84 | | |
| |||
88 | 88 | | |
89 | 89 | | |
90 | 90 | | |
91 | | - | |
| 91 | + | |
92 | 92 | | |
93 | 93 | | |
94 | 94 | | |
| |||
0 commit comments