Resolve merge conflict, update pluggy dependency

delphidigital · Oct 9, 2019 · 88a8ec2 · 88a8ec2
2 parents 0ffd66e + 6d29b3d
commit 88a8ec2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/requirements.txt b/requirements.txt
@@ -24,7 +24,7 @@ black==18.9b0
 Click==7.0
 filelock==3.0.10
 jsonschema==3.0.2
-pluggy==0.9.0
+pluggy==0.13.0
 py==1.8.0
 tox==3.14.0
 virtualenv==16.7.5