From a1e2c11d6969eb35901722ab4c3ebac2f3f412ba Mon Sep 17 00:00:00 2001
From: Diego Medina <diegomedina24@gmail.com>
Date: Thu, 17 Mar 2022 16:45:08 -0300
Subject: [PATCH] merge migration

---
 superset/config.py                                            | 2 +-
 .../58df9d617f14_add_on_saved_query_delete_tab_state_.py      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/superset/config.py b/superset/config.py
index e8031259b5dfd..efb5178679d4a 100644
--- a/superset/config.py
+++ b/superset/config.py
@@ -1372,7 +1372,7 @@ def SQL_QUERY_MUTATOR(  # pylint: disable=invalid-name,unused-argument
     try:
         # pylint: disable=import-error,wildcard-import,unused-wildcard-import
         import superset_config
-        from superset_config import *
+        from superset_config import *  # type:ignore
 
         print(f"Loaded your LOCAL configuration at [{superset_config.__file__}]")
     except Exception:
diff --git a/superset/migrations/versions/58df9d617f14_add_on_saved_query_delete_tab_state_.py b/superset/migrations/versions/58df9d617f14_add_on_saved_query_delete_tab_state_.py
index 4b8e9070b484c..220370f828049 100644
--- a/superset/migrations/versions/58df9d617f14_add_on_saved_query_delete_tab_state_.py
+++ b/superset/migrations/versions/58df9d617f14_add_on_saved_query_delete_tab_state_.py
@@ -17,14 +17,14 @@
 """add_on_saved_query_delete_tab_state_null_constraint"
 
 Revision ID: 58df9d617f14
-Revises: 7293b0ca7944
+Revises: 6766938c6065
 Create Date: 2022-03-16 23:24:40.278937
 
 """
 
 # revision identifiers, used by Alembic.
 revision = "58df9d617f14"
-down_revision = "7293b0ca7944"
+down_revision = "6766938c6065"
 
 import sqlalchemy as sa
 from alembic import op