fix merge conflicts

60107a20 · sean.melissari · e86d4d55 · 539fd811 · 60107a20
Commit 60107a20 authored Nov 12, 2020 by sean.melissari
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

README.md README.md +1 -1

No files found.
--- a/README.md
+++ b/README.md
@@ -12,4 +12,4 @@ The source-controller is a Kubernetes operator, specialised in artifacts acquisi
 - makes the artifacts addressable by their source identifier (sha, version, ts)
 - makes the artifacts available in-cluster to interested 3rd parties
 - notifies interested 3rd parties of source changes and availability (status conditions, events, hooks)
- reacts to Git push and Helm chart upload events (via notification-controller)
\ No newline at end of file
+- reacts to Git push and Helm chart upload events (via notification-controller)