Fix rebase conflict

jwt · Aug 17, 2024 · 8761f3e · 8761f3e
1 parent 50e2dd1
commit 8761f3e
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,11 +10,8 @@
 
 **Fixes and enhancements:**
 
-<<<<<<< HEAD
 - Refactor claim validators into their own classes [#605](https://github.com/jwt/ruby-jwt/pull/605) ([@anakinj](https://github.com/anakinj), [@MatteoPierro](https://github.com/MatteoPierro))
-=======
 - Allow extending available algorithms [#607](https://github.com/jwt/ruby-jwt/pull/607) ([@anakinj](https://github.com/anakinj))
->>>>>>> 0f1eba1 (Algorithm registration logic)
 - Your contribution here
 
 ## [v2.8.2](https://github.com/jwt/ruby-jwt/tree/v2.8.2) (2024-06-18)