From e7a4f0d391054bfabc586a5053c8fdc86265c5e5 Mon Sep 17 00:00:00 2001 From: Becca Petrin Date: Tue, 5 Mar 2019 15:14:33 -0800 Subject: [PATCH] strip merge markdown from changelog --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7f9919be..30c7459cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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: