Skip to content

[Workflow] fix fail merge #12150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[Workflow] fix fail merge #12150

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/workflow.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ you can retreive a workflow from it and use it as follows::

// ...
// Consider that $blogPost is in place "draft" by default
Copy link
Contributor

@OskarStark OskarStark Aug 14, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// Consider that $blogPost is in place "draft" by default

// Consider that $post is in state "draft" by default
// Consider that $blogPost is in state "draft" by default
Copy link
Contributor

@alexislefebvre alexislefebvre Aug 13, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The line is duplicated. Maybe it will be fixed after rebasing and fixing the conflicts.

$blogPost = new BlogPost();
$workflow = $registry->get($blogPost);

Expand Down