You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@superset.apache.org by vi...@apache.org on 2022/04/04 12:01:36 UTC

[superset] 02/02: fix bad conflict resolution

This is an automated email from the ASF dual-hosted git repository.

villebro pushed a commit to branch lts-v1
in repository https://gitbox.apache.org/repos/asf/superset.git

commit f20bf6baae157e15e876aa226b26f76d95089a9d
Author: Ville Brofeldt <vi...@gmail.com>
AuthorDate: Mon Apr 4 11:58:52 2022 +0300

    fix bad conflict resolution
---
 superset-frontend/src/SqlLab/components/App/index.jsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/App/index.jsx b/superset-frontend/src/SqlLab/components/App/index.jsx
index f68cdd50dc..47472335ce 100644
--- a/superset-frontend/src/SqlLab/components/App/index.jsx
+++ b/superset-frontend/src/SqlLab/components/App/index.jsx
@@ -117,8 +117,7 @@ class App extends React.PureComponent {
     }
     return (
       <div className="App SqlLab">
-        <QueryAutoRefresh />
-        <TabbedSqlEditors />
+        {content}
         <ToastContainer />
       </div>
     );