Resolve merge conflict

tests/contrib/mariadb/test_mariadb.py

@@ -1,8 +1,5 @@
-<<<<<<< HEAD
 import os
-=======
 from typing import Tuple
->>>>>>> 22746a31 (chore(mariadb): update tests to support mariadb>=1.1.0 (#3883))
 
 import mariadb
 import pytest
@@ -133,30 +130,9 @@ def test_analytics_default(connection, tracer):
     assert span.get_metric(ANALYTICS_SAMPLE_RATE_KEY) is None
 
 
-<<<<<<< HEAD
-test_user_specified_code = """
-from ddtrace import config
-from ddtrace import patch
-from ddtrace import tracer
-import mariadb
-patch(mariadb=True)
-from tests.contrib.config import MARIADB_CONFIG
-connection = mariadb.connect(**MARIADB_CONFIG)
-cursor = connection.cursor()
-cursor.execute("SELECT 1")
-rows = cursor.fetchall()
-assert len(rows) == 1
-tracer.shutdown()
-"""
-
-
-@snapshot(async_mode=False)
-def test_user_specified_dd_service_snapshot(run_python_code_in_subprocess):
-=======
 @pytest.mark.subprocess(env=dict(DD_SERVICE="mysvc"))
 @snapshot(async_mode=False, variants=SNAPSHOT_VARIANTS)
 def test_user_specified_dd_service_snapshot():
->>>>>>> 22746a31 (chore(mariadb): update tests to support mariadb>=1.1.0 (#3883))
     """
     When a user specifies a service for the app
         The mariadb integration should not use it.
@@ -170,14 +146,9 @@ def test_user_specified_dd_service_snapshot():
     assert status == 0, err
 
 
-<<<<<<< HEAD
-@snapshot(async_mode=False)
-def test_user_specified_dd_mariadb_service_snapshot(run_python_code_in_subprocess):
-=======
 @pytest.mark.subprocess(env=dict(DD_MARIADB_SERVICE="mysvc"))
 @snapshot(async_mode=False, variants=SNAPSHOT_VARIANTS)
 def test_user_specified_dd_mariadb_service_snapshot():
->>>>>>> 22746a31 (chore(mariadb): update tests to support mariadb>=1.1.0 (#3883))
     """
     When a user specifies a service for the app
         The mariadb integration should not use it.