Resolved merge conflicts by selecting final versions of package-lock.…

…json, package.json, src/app/app.module.ts, docs/workflow/blocks/actions.rst, and src/styles/main.scss from origin/angular-18-upgrade-rebase
kendraio · Nov 7, 2024 · 067a748 · 067a748
2 parents b608b24 + 22819b4
commit 067a748
Show file tree

Hide file tree

Showing 6 changed files with 170 additions and 545 deletions.
diff --git a/docs/workflow/blocks/actions.rst b/docs/workflow/blocks/actions.rst
@@ -44,7 +44,7 @@ Example
 
 This example shows two buttons. The first one dispatches an asynchronous command using the
 :doc:`Event Dispatch <dispatch>` bloc, the second one does nothing, but includes an ``init``
-block in order to start the inner Flow so that it runs and signals completion to the outer Flow.
+block in order to start the inner workflow so that it runs and signals completion to the outer workflow.
 
 .. code-block:: json
   {