add changelog entry

reeganviljoen · reeganviljoen · commit 4a8dea32d6bc · 2025-03-18T18:55:45.000+02:00
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -66,9 +66,15 @@ nav_order: 5
 
     *Reegan Viljoen*
 
+<<<<<<< HEAD
 * Updates ActionText compatibility documentation to reference `rich_textarea_tag` for Rails 8.0 support.
 
     *Alvin Crespo*
+=======
+* Add Reegan Viljoen to Commit Team
+
+    *Reegan Viljoen*
+>>>>>>> a68fc7db (add changelog entry)
 
 ## 3.20.0
 
