a

tektoncd · Sep 24, 2021 · beb7617 · beb7617
1 parent 380600a
commit beb7617
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/teps/README.md b/teps/README.md
@@ -222,8 +222,5 @@ This is the complete list of Tekton teps:
 |[TEP-0072](0072-results-json-serialized-records.md) | Results: JSON Serialized Records | implementable | 2021-07-26 |
 |[TEP-0073](0073-simplify-metrics.md) | Simplify metrics | proposed | 2021-06-23 |
 |[TEP-0080](0080-support-domainscoped-parameterresult-names.md) | Support domain-scoped parameter/result names | implemented | 2021-08-19 |
-<<<<<<< HEAD
-|[TEP-0084](0084-endtoend-provenance-collection.md) | end-to-end provenance collection | proposed | 2021-09-16 |
-=======
 |[TEP-0083](0083-scheduled-pipelinerun--tekton-polling.md) | Scheduled Pipelinerun &amp; Tekton Polling | proposed | 2021-09-13 |
->>>>>>> fd7a3b3 (TEP-0083: Scheduled Pipelinerun & Tekton Polling)
+|[TEP-0084](0084-endtoend-provenance-collection.md) | end-to-end provenance collection | proposed | 2021-09-16 |