missed a merge conflict

aws · Apr 20, 2020 · 1a6cb7f · 1a6cb7f
1 parent 1086bdb
commit 1a6cb7f
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/lambda/run-lambda-task.test.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/test/lambda/run-lambda-task.test.ts
@@ -63,17 +63,10 @@ test('Lambda function can be used in a Task with Task Token', () => {
   const task = new sfn.Task(stack, 'Task', {
     task: new tasks.RunLambdaTask(fn, {
       integrationPattern: sfn.ServiceIntegrationPattern.WAIT_FOR_TASK_TOKEN,
-<<<<<<< HEAD
       payload: sfn.TaskInput.fromObject({
         token: sfn.Context.taskToken
-      })
-    })
-=======
-      payload: {
-        token: sfn.Context.taskToken,
-      },
+      }),
     }),
->>>>>>> master
   });
   new sfn.StateMachine(stack, 'SM', {
     definition: task,