Resolve conflicts.

Author: chuyang-deng

tests/unit/test_local_session.py

@@ -156,7 +156,6 @@ def test_create_model(LocalSession):
     local_sagemaker_client = sagemaker.local.local_session.LocalSagemakerClient()
 
     local_sagemaker_client.create_model(MODEL_NAME, PRIMARY_CONTAINER)
-<<<<<<< HEAD
 
     assert MODEL_NAME in sagemaker.local.local_session.LocalSagemakerClient._models
 
@@ -170,10 +169,6 @@ def test_delete_model(LocalSession):
 
     local_sagemaker_client.delete_model(MODEL_NAME)
     assert MODEL_NAME not in sagemaker.local.local_session.LocalSagemakerClient._models
-=======
-
-    assert MODEL_NAME in sagemaker.local.local_session.LocalSagemakerClient._models
->>>>>>> 334a0d6... Modify some functions, tests and update docs.
 
 
 @patch('sagemaker.local.local_session.LocalSession')
@@ -242,7 +237,6 @@ def test_describe_endpoint_config(LocalSession):
 def test_create_endpoint_config(LocalSession):
     local_sagemaker_client = sagemaker.local.local_session.LocalSagemakerClient()
     local_sagemaker_client.create_endpoint_config(ENDPOINT_CONFIG_NAME, PRODUCTION_VARIANTS)
-<<<<<<< HEAD
 
     assert ENDPOINT_CONFIG_NAME in sagemaker.local.local_session.LocalSagemakerClient._endpoint_configs
 
@@ -256,10 +250,6 @@ def test_delete_endpoint_config(LocalSession):
 
     local_sagemaker_client.delete_endpoint_config(ENDPOINT_CONFIG_NAME)
     assert ENDPOINT_CONFIG_NAME not in sagemaker.local.local_session.LocalSagemakerClient._endpoint_configs
-=======
-
-    assert ENDPOINT_CONFIG_NAME in sagemaker.local.local_session.LocalSagemakerClient._endpoint_configs
->>>>>>> 334a0d6... Modify some functions, tests and update docs.
 
 
 @patch('sagemaker.local.local_session.LocalSession')