From a8b360e2f21bc7748d7f259c95df16429e6c548c Mon Sep 17 00:00:00 2001
From: abrennan <abrennan@redhat.com>
Date: Wed, 30 Sep 2020 14:45:02 -0500
Subject: [PATCH] Remove leftover conflict notes

---
 modules/kn-trigger-update.adoc | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/modules/kn-trigger-update.adoc b/modules/kn-trigger-update.adoc
index 7951eb712a..f5b4614402 100644
--- a/modules/kn-trigger-update.adoc
+++ b/modules/kn-trigger-update.adoc
@@ -9,11 +9,7 @@ You can use the `kn trigger update` command with certain flags to update attribu
 
 .Example
 
-<<<<<<< HEAD
-. Update a trigger to filter exact event attributes that match incoming events, such as `type=knative.dev.event`:
-
-=======
-* To update a trigger, enter the following command:
+. To update a trigger, enter the following command:
 +
 
 [source,terminal]
@@ -25,33 +21,21 @@ $ kn trigger update <trigger_name> --filter <key=value> --sink <sink_name> [flag
 You can update a trigger to filter exact event attributes that match incoming events, such as `type=knative.dev.event`. For example:
 +
 
->>>>>>> Updating eventing workflows for GA
 [source,terminal]
 ----
 $ kn trigger update <trigger_name> --filter type=knative.dev.event
 ----
 
-<<<<<<< HEAD
-. Remove the filter attribute with key `type`:
-=======
+. You can also remove a filter attribute from a trigger. For example, you can remove the filter attribute with key `type`:
 +
-You can also remove a filter attribute from a trigger.
-For example, you can remove the filter attribute with key `type`:
-+
->>>>>>> Updating eventing workflows for GA
 
 [source,terminal]
 ----
 $ kn trigger update <trigger_name> --filter type-
 ----
 
-<<<<<<< HEAD
 . Update the sink of a trigger to use a service named `event-display`:
-=======
 +
-The following example shows how to update the sink of a trigger to `svc:new-service`:
-+
->>>>>>> Updating eventing workflows for GA
 
 [source,terminal]
 ----