Fix merge.
authorWayne Davison <wayne@opencoder.net>
Sat, 4 Jul 2020 17:34:27 +0000 (10:34 -0700)
committerWayne Davison <wayne@opencoder.net>
Sat, 4 Jul 2020 17:34:27 +0000 (10:34 -0700)
commit15e3390baa8e99808bac988d839443666c15340b
tree09a05f350fa8e9d40fa8633ec4b9a11a67c517a6
parent858d507239fdaf946b03d6b5f458e17037aea1a9
Fix merge.
nameconverter.diff