Merge and resolve conflict

kristw · Aug 27, 2018 · fdd8ab5 · fdd8ab5
1 parent 31108b6
commit fdd8ab5
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/superset/assets/src/explore/controls.jsx b/superset/assets/src/explore/controls.jsx
@@ -516,6 +516,8 @@ export const controls = {
       'Russia',
       'Singapore',
       'Spain',
+      'Thailand',
+      'Timorleste',
       'Uk',
       'Ukraine',
       'Usa',