bruh

Akuli · Nov 1, 2023 · b9e60f2 · b9e60f2
2 parents bb33002 + 95a4f5c
commit b9e60f2
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,4 +1,5 @@
 # Auto-generated in GitHub Actions. See autofix.yml.
+<<<<<<< HEAD
 pytest==7.4.0
 pytest-randomly==3.13.0
 pytest-cov==4.1.0
@@ -10,6 +11,18 @@ pyupgrade==3.10.1
 sphinx>=4.0.0, <5.0.0
 pillow>=10.0.0
 requests>=2.31.0, <3.0.0
+=======
+pytest==6.2.5
+pytest-cov==4.0.0
+pytest-mock==3.10.0
+pycln==2.1.3
+black==23.1.0
+isort==5.12.0
+pyupgrade==3.9.0
+sphinx>=4.0.0, <5.0.0
+pillow>=5.4.1
+requests>=2.24.0, <3.0.0
+>>>>>>> origin/main
 mypy==1.1.1
 types-Pygments==2.16.0.0
 types-docutils==0.20.0.1