Remove a Git mark that was left from a merge conflict (#3616)

This commit is contained in:
Achilleas Pipinellis
2017-06-15 23:29:38 +02:00
committed by John Mulhausen
parent bc17693539
commit bb70a0eb17

View File

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