[superset] branch 1.4 updated: fix conflicts

[el...@apache.org]

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

elizabeth pushed a commit to branch 1.4
in repository https://gitbox.apache.org/repos/asf/superset.git


The following commit(s) were added to refs/heads/1.4 by this push:
     new eb64f82  fix conflicts
eb64f82 is described below

commit eb64f82c20661ef32efa786d7ac7e9eec8794305
Author: Elizabeth Thompson <es...@gmail.com>
AuthorDate: Mon Nov 22 16:48:37 2021 -0800

    fix conflicts
---
 superset-frontend/src/explore/exploreUtils/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/superset-frontend/src/explore/exploreUtils/index.js b/superset-frontend/src/explore/exploreUtils/index.js
index af252e6..9b0cf66 100644
--- a/superset-frontend/src/explore/exploreUtils/index.js
+++ b/superset-frontend/src/explore/exploreUtils/index.js
@@ -27,7 +27,6 @@ import {
   getChartBuildQueryRegistry,
   getChartMetadataRegistry,
 } from '@superset-ui/core';
-import { omit } from 'lodash';
 import { availableDomains } from 'src/utils/hostNamesConfig';
 import { safeStringify } from 'src/utils/safeStringify';
 import { URL_PARAMS } from 'src/constants';