fix CI errors

Signed-off-by: Varsha U N <[email protected]>

Author: VarshaUN

scanpipe/pipelines/__init__.py

@@ -32,11 +32,10 @@
 import bleach
 from markdown_it import MarkdownIt
 from pyinstrument import Profiler
+from django.conf import settings
 
 from aboutcode.pipeline import BasePipeline
 from scancodeio.settings import download_store
-from scancodeio.settings import settings
-
 logger = logging.getLogger(__name__)
 
 

scanpipe/tests/test_pipelines.py

@@ -2,6 +2,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
 >>>>>>> ca2f49f5 (Revert "Revert "Revert "add tests for storing packages""")