refactor: resolved conflict

ZhikharevAl · Oct 3, 2024 · fd5afac · fd5afac
1 parent f929f85
commit fd5afac
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -11,4 +11,4 @@ pytest.log
 
 # Allure
 allure-results/
-allure-report/
+allure-report/
diff --git a/requirements.txt b/requirements.txt