Fix versioning semantic merge conflict (#629)

This commit is contained in:
gbrodman 2020-06-16 12:51:28 -04:00 committed by GitHub
parent 47178d4fb5
commit 4f37c65af5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23