Skip to content
This repository was archived by the owner on May 23, 2024. It is now read-only.

Commit 21af6ef

Browse files
author
Chuyang Deng
committed
update test quotes
1 parent 0f5fa25 commit 21af6ef

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

test/integration/local/test_pre_post_processing_mme.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,8 @@ def container(volume, docker_base_name, tag, runtime_config):
8585
@pytest.fixture
8686
def model():
8787
model_data = {
88-
<<<<<<< HEAD
8988
"model_name": MODEL_NAME,
90-
"url": "/opt/ml/models/half_plus_three"
91-
=======
92-
'model_name': MODEL_NAME,
93-
'url': '/opt/ml/models/half_plus_three/model/half_plus_three'
94-
>>>>>>> 2d2cfadc557d9b8716eefae2e6982eaab91d82ad
89+
"url": "/opt/ml/models/half_plus_three/model/half_plus_three"
9590
}
9691
make_load_model_request(json.dumps(model_data))
9792
return MODEL_NAME

0 commit comments

Comments
 (0)