Fix merge conflicts

This commit is contained in:
John Mulhausen 2016-11-28 14:44:22 -08:00
commit 2f817e465b
1 changed files with 1 additions and 1 deletions

View File

@ -1,5 +1,5 @@
---
description: 'Instructions for installing Docker on Ubuntu. '
description: Instructions for installing Docker on Ubuntu
keywords: Docker, Docker documentation, requirements, apt, installation, ubuntu
redirect_from:
- /engine/installation/ubuntulinux/