Fix merge conflict (#5939)

firebase · Jun 6, 2023 · 78fb757 · 78fb757
1 parent 6d9047f
commit 78fb757
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,2 @@
 - Delete and re-create v2 function on Cloud Run API quota exhaustion (#5719).
-- Address additional cases where we were attempting to deploy a framework's development bundle (#5895)
 - firebase functions:secrets:\* ensure the secretmanager API is enabled (#5918)