Rebased with develop

Signed-off-by: Navonil Das <[email protected]>

Author: NavonilDas

requirements.txt

@@ -5,11 +5,8 @@ lxml==4.3.3
 django==2.2.4
 djangorestframework==3.9.2
 django-filter==2.1.0
-<<<<<<< HEAD
 packageurl-python==0.8.7
-=======
 semantic-version==2.8.2
->>>>>>> Collect NPM #101
 
 # Tests
 pytest==3.2.3

vulnerabilities/data_dump.py

@@ -127,12 +127,17 @@ def archlinux_dump(extract_data):
             VulnerabilityReference.objects.create(
                 vulnerability=vulnerability,
                 reference_id=vulnerability_id,
+<<<<<<< HEAD
 <<<<<<< HEAD
                 url=f'https://security.archlinux.org/{vulnerability_id}',
 =======
                 url='https://security.archlinux.org/{}'.format(
                     vulnerability_id)
 >>>>>>> fixed styling issue
+=======
+                url='https://security.archlinux.org/{}'.format(
+                    vulnerability_id)
+>>>>>>> b143b7638e35e5599d23ac82415f551fe8d56d30
             )
 
         for package_name in packages_name: