merge conflict UGH

dmarticus · dmarticus · commit f13c1e2c3774 · 2025-02-25T14:12:17.000-08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,7 @@
-<<<<<<< HEAD
-=======
 ## 3.15.1 - 2025-02-23
 
 1. Fix async client support for OpenAI.
 
->>>>>>> master
 ## 3.15.0 - 2025-02-19
 
 1. Support quota-limited feature flags
