resolved merge conflict

3 months ago · 2ee5a0ca61
parent b81af2e29f
commit 2ee5a0ca61
2 changed files with 2 additions and 1 deletions
--- a/pyproject.toml
+++ b/pyproject.toml
@ -145,3 +145,4 @@ exclude = '''
 )/
 '''

+
--- a/requirements.txt
+++ b/requirements.txt
@ -27,4 +27,4 @@ aiofiles
 clusterops
 reportlab
 doc-master
-pathos
+pathos