From 31b5056696a3d0bd9aa3248c91a4cff45016d92a Mon Sep 17 00:00:00 2001
From: mousebot <mousebot@riseup.net>
Date: Fri, 24 Apr 2020 20:02:17 -0300
Subject: [PATCH] v

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

diff --git a/setup.py b/setup.py
index 68b4276..b3c6fc4 100644
--- a/setup.py
+++ b/setup.py
@@ -7,11 +7,7 @@ with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
     long_description = f.read()
     
 setup(name='mkv-this',
-<<<<<<< HEAD
-      version='0.1.33',
-=======
       version='0.1.34',
->>>>>>> testing
       description='cli wrapper for markovify: take a text file or URL, markovify, save the results.',
       long_description=long_description,
       long_description_content_type='text/markdown',