fix merge conflict

2020-11-24 17:19:31 -06:00
parent 777c95aab2 5bad633987
commit 6e024871ec
22 changed files with 448 additions and 64 deletions
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ with open('README.rst') as f:
    readme = f.read()

 extras_require = {
-    'voice': ['PyNaCl==1.3.0'],
+    'voice': ['PyNaCl>=1.3.0,<1.5'],
    'docs': [
        'sphinx==3.0.3',
        'sphinxcontrib_trio==1.1.2',