[AIRFLOW-XXX] Remove residual line in Changelog (apache#3814)

aliceabe · Jan 3, 2019 · e826e1e · e826e1e
1 parent b24c84d
commit e826e1e
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -780,7 +780,6 @@ AIRFLOW 1.10.0, 2018-08-03
 [AIRFLOW-1609] Fix gitignore to ignore all venvs
 [AIRFLOW-1601] Add configurable task cleanup time
 
->>>>>>> 862ad8b9... [AIRFLOW-XXX] Update changelog for 1.10
 AIRFLOW 1.9.0, 2018-01-02
 -------------------------