Commit d8a2b6af authored by Mart van Santen's avatar Mart van Santen
Browse files

Fix conflix

parent e5839011
......@@ -3,11 +3,7 @@ import sys
from setuptools import setup
from setuptools import find_packages
<<<<<<< HEAD
own_version = '0.1.2'
=======
own_version = '0.2.0'
>>>>>>> develop
certbot_version = '0.8.1'
# Please update tox.ini when modifying dependency version requirements
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment