From bb70a0eb17400e915a244b7e4a9783255066512c Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Thu, 15 Jun 2017 23:29:38 +0200 Subject: [PATCH] Remove a Git mark that was left from a merge conflict (#3616) --- docker-id/index.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-id/index.md b/docker-id/index.md index 10f0e92293..58594a8152 100644 --- a/docker-id/index.md +++ b/docker-id/index.md @@ -53,4 +53,3 @@ stored in your home directory in `.docker/config.json`. The password is base64 encoded in this file. If you require secure storage for this password, use the [Docker credential helpers](https://github.com/moby/moby-credential-helpers). {:.warning} ->>>>>>> Update index.md