From a3b42309e9d216f362133c5050a3e775afb2de60 Mon Sep 17 00:00:00 2001
From: Ulysses Souza <ulyssessouza@gmail.com>
Date: Fri, 7 Feb 2020 01:00:18 +0100
Subject: [PATCH] Post release 4.2.0 update:

- Changelog
- Next Version

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
---
 docs/change-log.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/change-log.md b/docs/change-log.md
index ec73b8d8..e1b9e5da 100644
--- a/docs/change-log.md
+++ b/docs/change-log.md
@@ -36,7 +36,10 @@ Change log
 
 - Add support for docker contexts through `docker.ContextAPI`
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> 7c4194c... Post release 4.2.0 update:
 4.1.0
 -----