fix: solve merge conflicts

Valeri0p · May 28, 2022 · a4c888f · a4c888f
2 parents a5b19b6 + 9d75116
commit a4c888f
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 1 deletion.
diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -1,3 +1,4 @@
 pytest == 7.1.2
 pytest-mock == 3.7.0
-pytest-cov == 3.0.0
+pytest-cov == 3.0.0
+pytest-asyncio == 0.18.3
diff --git a/src/__init__.py b/src/__init__.py
diff --git a/main.py → src/main.py b/main.py → src/main.py
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tests/main_test.py b/tests/main_test.py