clean up merge conflicts

kendraio · Sep 11, 2024 · 14fbbe1 · 14fbbe1
1 parent be10138
commit 14fbbe1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 19 deletions.
diff --git a/docs/workflow/blocks/launch_block.rst b/docs/workflow/blocks/launch_block.rst
@@ -1,19 +1,15 @@
 Launch
 ======
 
-<<<<<<< HEAD
-Useful to jump to a different Flow. This block is not available to be added to a flow directly, but is instead for use from within other blocks.
+Useful to jump to a different Flow. This block is not available to be added to a Flow directly, but is instead for use from within other blocks.
 
 If you want to jump to a different Flow from a button the :doc:`Link Action Block <link_action_block>`, allows opening Flows in a new tab or window as an alternative to an :doc:`Actions block button <actions>` being used with a Launch block.
-=======
-Jump to a new Flow. This block is not available to be added to a Flow directly, but is instead for use from within other blocks. 
->>>>>>> e5a07579 (Convert "Workflow" text to "Flow" (#451))
 
 Default config
 --------------
 
 .. code-block:: json
-
+.nvmrc
     {
       "type": "launch",
       "adapter": "", 

diff --git a/docs/workflow/implementation.rst b/docs/workflow/implementation.rst
@@ -2,11 +2,7 @@ How Flows get executed
 ======================
 
 Flows are implemented using Angular's built-in execution chaining. 
-<<<<<<< HEAD
-While this simplifies the whole process of running workflows, it does 
-=======
 While this simplifies the whole process of running Flows, it does 
->>>>>>> e5a07579 (Convert "Workflow" text to "Flow" (#451))
 introduce some challenges - many of which can be overcome by understanding
 a little about how flows are run, and in particular, the way change detection
 works. 

diff --git a/docs/workflow/intro.rst b/docs/workflow/intro.rst
@@ -5,21 +5,12 @@ Overview
 --------
 
 Flows are created by plugging together various reusable blocks of functionality.
-<<<<<<< HEAD
 A Flow is made from multiple blocks that connect together. A task is a running instance of a Flow.
 Flows can be nested inside other Flows.
 Thus, tasks are nested too, and a running task may contain multiple tasks within it.
 
 The available “blocks” of reusable functionality are documented below.
 The Flow builder in the app lets you create and customise Flows,
-=======
-A Flow is a list of Flow items (or blocks). A task is a running instance of a Flow.
-Flow definitions can be nested, as some Flow item blocks contain embedded Flows.
-Thus, tasks are nested too, and a running task may contain multiple tasks within it.
-
-The available “blocks” of reusable functionality are documented below.
-The Flow builder within the app lets you create and customise Flows,
->>>>>>> e5a07579 (Convert "Workflow" text to "Flow" (#451))
 load existing Flows from adapters, and generate links to share Flows you have created.
 
 Block Metadata & Comments