Merge branch 'role_permissions' of github.com:simchaNielsen/incubator…

…-superset into role_permissions � Conflicts: � superset-frontend/src/featureFlags.ts
apache · Feb 22, 2021 · 26556fc · 26556fc
2 parents 5e72312 + 723be53
commit 26556fc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/superset-frontend/src/featureFlags.ts b/superset-frontend/src/featureFlags.ts
@@ -36,8 +36,8 @@ export enum FeatureFlag {
   ESCAPE_MARKDOWN_HTML = 'ESCAPE_MARKDOWN_HTML',
   DASHBOARD_NATIVE_FILTERS = 'DASHBOARD_NATIVE_FILTERS',
   DASHBOARD_CROSS_FILTERS = 'DASHBOARD_CROSS_FILTERS',
-  DASHBOARD_NATIVE_FILTERS_SET = 'DASHBOARD_NATIVE_FILTERS_SET',
   DASHBOARD_RBAC = 'DASHBOARD_RBAC',
+  DASHBOARD_NATIVE_FILTERS_SET = 'DASHBOARD_NATIVE_FILTERS_SET',
   VERSIONED_EXPORT = 'VERSIONED_EXPORT',
   GLOBAL_ASYNC_QUERIES = 'GLOBAL_ASYNC_QUERIES',
   ENABLE_TEMPLATE_PROCESSING = 'ENABLE_TEMPLATE_PROCESSING',