docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts

This commit is contained in:
Maria Bermudez 2019-05-20 12:30:15 -07:00
parent b4ed42c716
commit bfa5a4a664
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ee/dtr/release-notes.md
View File

@ -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