Merge commit '4c9db329d9303a64b0cd7a3d40be24d2b5e667fa' into chrissimpkins-update...

diff --cc axisregistry/.github/ISSUE_TEMPLATE/1_add-axis.md
index 0000000000000000000000000000000000000000,d51de94299ac586e5609900311c7c496c39cec71..d51de94299ac586e5609900311c7c496c39cec71
mode 000000,100644..100644
--- /dev/null
--- 2/.github/ISSUE_TEMPLATE/1_add-axis.md
+++ b/axisregistry/.github/ISSUE_TEMPLATE/1_add-axis.md

diff --cc axisregistry/.github/ISSUE_TEMPLATE/2_anything-else.md
index 0000000000000000000000000000000000000000,3daeb46349eea1446d11e5a7d6796f9bb92d6f00..3daeb46349eea1446d11e5a7d6796f9bb92d6f00
mode 000000,100644..100644
--- /dev/null
--- 2/.github/ISSUE_TEMPLATE/2_anything-else.md
+++ b/axisregistry/.github/ISSUE_TEMPLATE/2_anything-else.md

diff --cc axisregistry/CHANGELOG.md
Simple merge

diff --cc axisregistry/Lib/axisregistry/__init__.py
Simple merge

diff --cc axisregistry/Lib/axisregistry/data/bounce.textproto
index 0000000000000000000000000000000000000000,f78f6ceb5c886a50f427ac274727e8aa4fa90313..f78f6ceb5c886a50f427ac274727e8aa4fa90313
mode 000000,100644..100644
--- /dev/null
--- 2/Lib/axisregistry/data/bounce.textproto
+++ b/axisregistry/Lib/axisregistry/data/bounce.textproto

diff --cc axisregistry/Lib/axisregistry/data/informality.textproto
index 0000000000000000000000000000000000000000,bc819de7a81e1ae438c4129ec7b38c22695e3f46..bc819de7a81e1ae438c4129ec7b38c22695e3f46
mode 000000,100644..100644
--- /dev/null
--- 2/Lib/axisregistry/data/informality.textproto
+++ b/axisregistry/Lib/axisregistry/data/informality.textproto

diff --cc axisregistry/Lib/axisregistry/data/spacing.textproto
index 0000000000000000000000000000000000000000,979b70173bee244de0c77e031ddf255cea30aaa7..979b70173bee244de0c77e031ddf255cea30aaa7
mode 000000,100644..100644
--- /dev/null
--- 2/Lib/axisregistry/data/spacing.textproto
+++ b/axisregistry/Lib/axisregistry/data/spacing.textproto

diff --cc axisregistry/Lib/axisregistry/data/x_rotation.textproto
Simple merge

diff --cc axisregistry/Lib/axisregistry/data/y_rotation.textproto
Simple merge

diff --cc axisregistry/setup.py
Simple merge

diff --cc axisregistry/tests/data/OpenSans-Italic[wdth,wght]_STAT.ttx
Simple merge

diff --cc axisregistry/tests/data/OpenSansCondensed-Italic[wght]_STAT.ttx
Simple merge

diff --cc axisregistry/tests/data/OpenSansCondensed[wght]_STAT.ttx
Simple merge

diff --cc axisregistry/tests/data/OpenSans[wdth,wght]_STAT.ttx
Simple merge

diff --cc axisregistry/tests/test_names.py
Simple merge