fixup! fix conflicts

apache · Nov 26, 2024 · bf818bd · bf818bd
1 parent 4a362f1
commit bf818bd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/airflow/migrations/versions/0050_3_0_0_remove_pickled_data_from_xcom_table.py b/airflow/migrations/versions/0050_3_0_0_remove_pickled_data_from_xcom_table.py
@@ -180,5 +180,3 @@ def downgrade():
 
         with op.batch_alter_table("xcom", schema=None) as batch_op:
             batch_op.drop_column("value_old")
-
-    op.drop_table("_xcom_archive", if_exists=True)
diff --git a/docs/apache-airflow/img/airflow_erd.sha256 b/docs/apache-airflow/img/airflow_erd.sha256
@@ -1 +1 @@
-0bfb0c5a54b321be706055a05d05ba2f9309b0a52e801aed485a7f816c2a75bd
+7e6189547c880bdbd8760f9b7d90919d3e1d08ef2477210dcf68a4edf8d0bcea
Original file line number	Diff line number	Diff line change
Expand Up		@@ -180,5 +180,3 @@ def downgrade():

		with op.batch_alter_table("xcom", schema=None) as batch_op:
		batch_op.drop_column("value_old")

		op.drop_table("_xcom_archive", if_exists=True)
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		0bfb0c5a54b321be706055a05d05ba2f9309b0a52e801aed485a7f816c2a75bd
		7e6189547c880bdbd8760f9b7d90919d3e1d08ef2477210dcf68a4edf8d0bcea