strip merge markdown from changelog

This commit is contained in:
Becca Petrin 2019-03-05 15:14:33 -08:00 committed by GitHub
parent 1909b20217
commit e7a4f0d391
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -60,7 +60,6 @@ FEATURES:
login may be initiatated from the Vault UI or through the `vault login` command.
* **ACL Path Wildcard**: ACL paths can now use the `+` character to enable wild card
matching for a single directory in the path definition.
>>>>>>> opensource-master
IMPROVEMENTS: