Merge commit '0672de' into axis-reg-pull-BLED-SCAN-SHLN

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

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

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

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

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