Fix "Merge branch 'master' into sanitize-project"

scrapy · Jul 18, 2024 · 287742d · 287742d
1 parent d8716c7
commit 287742d
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/tests/test_webservice.py b/tests/test_webservice.py
@@ -2,14 +2,9 @@
 from unittest import mock
 
 import pytest
-<<<<<<< HEAD
 from twisted.web.error import Error
 
-||||||| parent of 9e4eccd (test: Add tests to tests/test_webservice.py for directory traversal)
-=======
-
 from scrapyd.exceptions import DirectoryTraversalError, RunnerError
->>>>>>> 9e4eccd (test: Add tests to tests/test_webservice.py for directory traversal)
 from scrapyd.interfaces import IEggStorage
 from scrapyd.jobstorage import Job