From 45faf1f1e2149f3071f06dc38cf1aad5062ba6f9 Mon Sep 17 00:00:00 2001
From: mzwiessele <ibinbei@gmail.com>
Date: Thu, 22 Feb 2018 17:05:58 +0100
Subject: [PATCH] fix: pkg: merge in setup

---
 setup.cfg | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index da8c939f..e4e29dd7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,9 +1,5 @@
 [bumpversion]
-<<<<<<< HEAD
 current_version = 1.8.6
-=======
-current_version = 1.8.5
->>>>>>> deploy
 tag = True
 commit = True