This is an automated email from the ASF dual-hosted git repository.
ephraimanierobi pushed a commit to branch v2-2-stable
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 546087664b357fa3de2d7fb26736f206d6e76459
Author: Ephraim Anierobi <splendidzig...@gmail.com>
AuthorDate: Mon Mar 28 19:44:12 2022 +0100
fixup! Add 2.2.5 to CHANGELOG.txt and UPDATING.md
---
CHANGELOG.txt | 4 ----
1 file changed, 4 deletions(-)
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 50c53d2..97dbf48 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -46,10 +46,6 @@ Doc only changes
Misc
""""
-<<<<<<< HEAD
-- Update Kubernetes library version (#18797)
-=======
->>>>>>> Add 2.2.5 to CHANGELOG.txt and UPDATING.md
- Add the new Airflow Trove Classifier to setup.cfg (#22241)
- Rename ``to_delete`` to ``to_cancel`` in TriggerRunner (#20658)
