# Conflicts:
#	nes/nc_projections/default_nes.py
#	tests/test_bash.mn5.sh

# Conflicts:
#	nes/nc_projections/default_nes.py

Merge remote-tracking branch 'origin/develop-87-add-extra-name-options-to-the-time-variable-for-phenomena'

# Conflicts:
#	CHANGELOG.rst

# Conflicts:
#	nes/nc_projections/default_nes.py
#	nes/nc_projections/lcc_nes.py
#	nes/nc_projections/mercator_nes.py
#	nes/nc_projections/rotated_nes.py

Develop 94 mocage format

See merge request !116

Longitude reordering from [0, 360] to [-180, 180]

See merge request !115

comment out coordinates metadata

See merge request !114