From 287742deb7550c928729886b74ed83ad17b8a8db Mon Sep 17 00:00:00 2001
From: James McKinney <26463+jpmckinney@users.noreply.github.com>
Date: Thu, 18 Jul 2024 03:32:57 -0400
Subject: [PATCH] Fix "Merge branch 'master' into sanitize-project"

---
 tests/test_webservice.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tests/test_webservice.py b/tests/test_webservice.py
index 66d4ea6c..d8c044bd 100644
--- 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