Dealing with consts in tests

Author: Val Brodsky

libs/labelbox/tests/integration/conftest.py

@@ -7,15 +7,6 @@
 from typing import Type
 
 import pytest
-<<<<<<< HEAD
-=======
-from constants import (
-    CAPTURE_DT_SCHEMA_ID,
-    SPLIT_SCHEMA_ID,
-    TEST_SPLIT_ID,
-    TEXT_SCHEMA_ID,
-)
->>>>>>> a4fe5b93 (Refactor get datarows tests so that I can reuse some fixtures)
 
 from labelbox import (
     Classification,
@@ -33,7 +24,6 @@
 from labelbox.schema.ontology_kind import OntologyKind
 from labelbox.schema.queue_mode import QueueMode
 from labelbox.schema.user import User
-<<<<<<< HEAD
 
 
 @pytest.fixture
@@ -58,8 +48,6 @@ def constants():
         "EXPECTED_METADATA_SCHEMA_IDS": EXPECTED_METADATA_SCHEMA_IDS,
         "CUSTOM_TEXT_SCHEMA_NAME": CUSTOM_TEXT_SCHEMA_NAME,
     }
-=======
->>>>>>> a4fe5b93 (Refactor get datarows tests so that I can reuse some fixtures)
 
 
 @pytest.fixture