Fixed merge conflict

jschoewe · jschoewe · commit 0ac7d8317140 · 2021-01-13T16:05:55.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## Development
 
+- Switch from Travis to GitHub Actions
+
+  Contributed by Nick Maludy (@nmaludy)
+
 ## Release 1.2.0 (2020-12-02)
 
 * Added monitoring_prometheus bolt plan and task to optionally create/delete silences
