resolve merge conflict

jerrypeng7773 · jerrypeng7773 · commit c0066ea39cf4 · 2021-07-01T11:36:22.000-07:00
diff --git a/doc/workflows/pipelines/sagemaker.workflow.pipelines.rst b/doc/workflows/pipelines/sagemaker.workflow.pipelines.rst
@@ -5,7 +5,7 @@ ConditionStep
 -------------
 
 .. autoclass:: sagemaker.workflow.condition_step.ConditionStep
-
+.. autoclass:: sagemaker.workflow.condition_step.JsonGet
 
 Conditions
 ----------
@@ -54,7 +54,6 @@ Functions
 ---------
 
 .. autoclass:: sagemaker.workflow.functions.Join
-.. autoclass:: sagemaker.workflow.functions.JsonGet
 
 Parameters
 ----------
diff --git a/src/sagemaker/workflow/condition_step.py b/src/sagemaker/workflow/condition_step.py
@@ -89,6 +89,7 @@ def properties(self):
 @attr.s
 class JsonGet(Expression):
     """Get JSON properties from PropertyFiles.
+
     Attributes:
         step (Step): The step from which to get the property file.
         property_file (Union[PropertyFile, str]): Either a PropertyFile instance
diff --git a/tests/unit/sagemaker/workflow/test_steps.py b/tests/unit/sagemaker/workflow/test_steps.py
@@ -912,4 +912,3 @@ def test_multi_algo_tuning_step(sagemaker_session):
             ],
         },
     }
-

Original file line number	Diff line number	Diff line change
`@@ -912,4 +912,3 @@ def test_multi_algo_tuning_step(sagemaker_session):`
`912`	`912`	`],`
`913`	`913`	`},`
`914`	`914`	`}`
`915`		`-`