From 21f3e6fe1c8b6f402463e5808dbffde5f3b6688a Mon Sep 17 00:00:00 2001 From: Maria Bermudez Date: Mon, 20 May 2019 12:30:15 -0700 Subject: [PATCH] Fix conflicts --- ee/dtr/release-notes.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/ee/dtr/release-notes.md b/ee/dtr/release-notes.md index 7c2303a03e..84f3a5b4e8 100644 --- a/ee/dtr/release-notes.md +++ b/ee/dtr/release-notes.md @@ -78,8 +78,6 @@ to upgrade your installation to the latest release. * The `--no-image-check` flag has been removed from the `upgrade` command as image check is no longer a part of the upgrade process. -======= ->>>>>>> Sync forked amberjack branch with docs-private (#1068) # Version 2.6 ## 2.6.6