Skip to content

Commit c843938

Browse files
committed
Fix bad merge conflict resolution
1 parent e5f0a8c commit c843938

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lib/galaxy/model/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2630,7 +2630,7 @@ class PostJobAction(Base, RepresentById):
26302630
workflow_step_id: Mapped[Optional[int]] = mapped_column(ForeignKey("workflow_step.id"), index=True)
26312631
action_type: Mapped[str] = mapped_column(String(255))
26322632
output_name: Mapped[Optional[str]] = mapped_column(String(255))
2633-
_action_arguments: Mapped[Optional[bytes]] = mapped_column(MutableJSONType)
2633+
_action_arguments: Mapped[Optional[Dict[str, Any]]] = mapped_column("action_arguments", MutableJSONType)
26342634
workflow_step: Mapped[Optional["WorkflowStep"]] = relationship(
26352635
back_populates="post_job_actions",
26362636
primaryjoin=(lambda: WorkflowStep.id == PostJobAction.workflow_step_id),

0 commit comments

Comments
 (0)