Fix conflict

Signed-off-by: Shivam Sandbhor <shivam.sandbhor@gmail.com>

Author: sbs2001

vulnerabilities/tests/test_debian_oval.py

@@ -47,36 +47,19 @@ def test_get_data_from_xml_doc(self, mock_write):
                     PackageURL(
                         type="deb",
                         namespace=None,
-<<<<<<< HEAD
-                        name="krb5",
-                        version="0:0.11.1+dfsg-5+deb7u1",
-                        qualifiers=OrderedDict([("distro", "wheezy")]),
-                        subpath=None,
-                    )
-                },
-=======
                         name='krb5',
                         version='0.11.1+dfsg-5+deb7u1',
                         qualifiers=OrderedDict([('distro', 'wheezy')]),
                         subpath=None
                     )},
->>>>>>> Refactor to  handle default epochs
                 resolved_package_urls={
                     PackageURL(
                         type="deb",
                         namespace=None,
-<<<<<<< HEAD
-                        name="krb5",
-                        version="0:1.11.1+dfsg-5+deb7u1",
-                        qualifiers=OrderedDict([("distro", "wheezy")]),
-                        subpath=None,
-                    ),
-=======
                         name='krb5',
                         version='1.11.1+dfsg-5+deb7u1',
                         qualifiers=OrderedDict([('distro', 'wheezy')]),
                         subpath=None),
->>>>>>> Refactor to  handle default epochs
                     PackageURL(
                         type="deb",
                         namespace=None,
@@ -94,35 +77,6 @@ def test_get_data_from_xml_doc(self, mock_write):
                     PackageURL(
                         type="deb",
                         namespace=None,
-<<<<<<< HEAD
-                        name="a2ps",
-                        version="0:0.11.1+dfsg-5+deb7u1",
-                        qualifiers=OrderedDict([("distro", "wheezy")]),
-                        subpath=None,
-                    )
-                },
-                resolved_package_urls={
-                    PackageURL(
-                        type="deb",
-                        namespace=None,
-                        name="a2ps",
-                        version="2.3.9",
-                        qualifiers=OrderedDict([("distro", "wheezy")]),
-                        subpath=None,
-                    ),
-                    PackageURL(
-                        type="deb",
-                        namespace=None,
-                        name="a2ps",
-                        version="0:1.11.1+dfsg-5+deb7u1",
-                        qualifiers=OrderedDict([("distro", "wheezy")]),
-                        subpath=None,
-                    ),
-                },
-                vulnerability_id="CVE-2001-1593",
-            ),
-        ]
-=======
                         name='a2ps',
                         version='0.11.1+dfsg-5+deb7u1',
                         qualifiers=OrderedDict([('distro', 'wheezy')]),
@@ -144,7 +98,6 @@ def test_get_data_from_xml_doc(self, mock_write):
                 vulnerability_id='CVE-2001-1593')
 
         }
->>>>>>> Refactor to  handle default epochs
 
         xml_doc = ET.parse(os.path.join(TEST_DATA, "debian_oval_data.xml"))
         # Dirty quick patch to mock batch_advisories