Merge branch '0321-task-ref' of github.com:StackScribe/lifecycle-tool…

…kit into 0321-task-ref Signed-off-by: Meg McRoberts [email protected] Signed-off-by: Meg McRoberts <[email protected]>
keptn · Mar 31, 2023 · c8d1daf · c8d1daf
2 parents b5c75ad + 5b91097
commit c8d1daf
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/docs/content/en/docs/crd-ref/TaskDefinition/index.md b/docs/content/en/docs/crd-ref/TaskDefinition/index.md
@@ -17,7 +17,7 @@ metadata:
   name: <task-name>
 spec:
   function:
-    inline: | httpRef | functionRef
+    inline | httpRef | functionRef:
     [parameters:
       map:
         textMessage: "This is my configuration"]
@@ -253,8 +253,6 @@ spec:
       secret: slack-token
 ```
 
-<<<<<<< HEAD
-=======
 **More examples**
 
 * See the [operator/config/samples](https://github.com/keptn/lifecycle-toolkit/tree/main/operator/config/samples)
@@ -264,6 +262,8 @@ For example, the `lifecycle_v1alpha3_keptntaskdefinition` file
 contains examples for the `v1alpha3` version of the lifecycle API group.
 
 >>>>>>> 0333070 (library -> API)
+=======
+>>>>>>> 5b91097b2033a9e3c9fceefbbcca62544f9ab209
 ## Files
 
 API Reference: