fix: Fix accidental conflict

open-contracting · Apr 5, 2024 · 3d9701f · 3d9701f
1 parent e0ac4e3
commit 3d9701f
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/kingfisher_scrapy/spiders/moldova.py b/kingfisher_scrapy/spiders/moldova.py
@@ -1,13 +1,7 @@
 import scrapy
 
-<<<<<<< Updated upstream
-from kingfisher_scrapy.base_spiders import SimpleSpider
-from kingfisher_scrapy.exceptions import RetryableError
-||||||| Stash base
-from kingfisher_scrapy.base_spiders import SimpleSpider
-=======
 from kingfisher_scrapy.base_spiders import BaseSpider
->>>>>>> Stashed changes
+from kingfisher_scrapy.exceptions import RetryableError
 from kingfisher_scrapy.util import components, handle_http_error, join, parameters, replace_parameters