make requirements

StackStorm · Nov 19, 2024 · 19bcf81 · 19bcf81
1 parent 798bd78
commit 19bcf81
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -78,10 +78,5 @@ unittest2
 webob==1.8.9
 webtest
 zake==0.2.2
-<<<<<<< HEAD
 zipp==3.20.2
 zstandard==0.23.0
-=======
-zipp<3.16.0
-zstandard==0.15.2
->>>>>>> f405c12c2 (pin zipp < 3.16)