git.out

Auto-merging austaltools/_datasets.py
Auto-merging austaltools/_dispersion.py
Auto-merging austaltools/_netcdf.py
Auto-merging austaltools/_storage.py
Auto-merging austaltools/_tools.py
Auto-merging austaltools/configure_austaltools.py
Auto-merging austaltools/data/dataset_definitions.json
Auto-merging austaltools/input_weather.py
CONFLICT (add/add): Merge conflict in austaltools/input_weather.py
Auto-merging docs/install.rst
Auto-merging pyproject.toml
Auto-merging setup.py
Auto-merging tests/test__datasets.py
Auto-merging tests/test__netcdf.py
Auto-merging tests/test__tools.py
Auto-merging tests/test_input_weather.py
Squash commit -- not updating HEAD
Automatic merge failed; fix conflicts and then commit the result.