From: Viviana Monsalve Date: Wed, 6 Sep 2023 14:42:03 +0000 (-0500) Subject: Merge commit 'd333b3d07ea1961b1ba83ed62b87d61b7d33f5d2' into axis-reg-pull-ARRR X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F6663%2Fhead;p=thirdparty%2Fgoogle%2Ffonts.git Merge commit 'd333b3d07ea1961b1ba83ed62b87d61b7d33f5d2' into axis-reg-pull-ARRR --- 14cf997d81b354de2c8d29ea726d285574aba94d diff --cc axisregistry/Lib/axisregistry/data/ar_retinal_resolution.textproto index 0000000000,4b620f8a76..4b620f8a76 mode 000000,100644..100644 --- a/axisregistry/Lib/axisregistry/data/ar_retinal_resolution.textproto +++ b/axisregistry/Lib/axisregistry/data/ar_retinal_resolution.textproto diff --cc axisregistry/tests/test_wellformed.py index 0000000000,ac0eafd376..ac0eafd376 mode 000000,100644..100644 --- a/axisregistry/tests/test_wellformed.py +++ b/axisregistry/tests/test_wellformed.py