Post release 4.2.0 update:

ulyssessouza · aiordache · commit a3b42309e9d2 · 2020-08-10T17:59:01.000+02:00
- Changelog
- Next Version

Signed-off-by: Ulysses Souza &lt;ulyssessouza@gmail.com&gt;
diff --git 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
 -----
 
