[incubator-superset] branch master updated: [bugfix] time_pivot entry got missing in merge conflict (#4221)

[ma...@apache.org]

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

maximebeauchemin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git


The following commit(s) were added to refs/heads/master by this push:
     new a9610e2  [bugfix] time_pivot entry got missing in merge conflict (#4221)
a9610e2 is described below

commit a9610e288691a22063abd19404e32c393ef2847f
Author: Maxime Beauchemin <ma...@gmail.com>
AuthorDate: Wed Jan 17 13:54:45 2018 -0800

    [bugfix] time_pivot entry got missing in merge conflict (#4221)
    
    PR here https://github.com/apache/incubator-superset/pull/3518 missed a
    line of code while merging conflicts with time_pivot viz
---
 superset/assets/visualizations/main.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/superset/assets/visualizations/main.js b/superset/assets/visualizations/main.js
index 7cb040b..a455cf8 100644
--- a/superset/assets/visualizations/main.js
+++ b/superset/assets/visualizations/main.js
@@ -31,6 +31,7 @@ export const VIZ_TYPES = {
   sunburst: 'sunburst',
   table: 'table',
   time_table: 'time_table',
+  time_pivot: 'time_pivot',
   treemap: 'treemap',
   country_map: 'country_map',
   word_cloud: 'word_cloud',

-- 
To stop receiving notification emails like this one, please contact
['"commits@superset.apache.org" <co...@superset.apache.org>'].