Merge branch 'master' of github.com:Yelp/detect-secrets into bump-ver…

…sion
AzureDevOpsCommunity · Apr 14, 2021 · d780399 · d780399
2 parents 947fd56 + c5b56f4
commit d780399
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -76,7 +76,10 @@ If you love `detect-secrets`, please star our project on GitHub to show your sup
 [#441]: https://github.com/Yelp/detect-secrets/pull/441
 [#444]: https://github.com/Yelp/detect-secrets/pull/444
 [#446]: https://github.com/Yelp/detect-secrets/pull/446
+<<<<<<< HEAD
 [#448]: https://github.com/Yelp/detect-secrets/pull/448
+=======
+>>>>>>> c5b56f47b109c6b5172b4d14d6710d15f06ca6a7
 [@syn-4ck]: https://github.com/syn-4ck
 
 ### v1.0.3