Fix versioning semantic merge conflict (#629)

This commit is contained in:
gbrodman 2020-06-16 12:51:28 -04:00 committed by GitHub
parent 58c557d715
commit dcaef1c6fc