[bugfix] time_pivot entry got missing in merge conflict (#4221)
[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
zhouyao1994/incubator-superset,airbnb/superset,dmigo/incubator-superset,airbnb/caravel,apache/incubator-superset,zhouyao1994/incubator-superset,apache/incubator-superset,zhouyao1994/incubator-superset,airbnb/superset,mistercrunch/panoramix,airbnb/superset,airbnb/caravel,zhouyao1994/incubator-superset,airbnb/superset,timifasubaa/incubator-superset,timifasubaa/incubator-superset,apache/incubator-superset,apache/incubator-superset,timifasubaa/incubator-superset,zhouyao1994/incubator-superset,airbnb/caravel,airbnb/caravel,timifasubaa/incubator-superset,dmigo/incubator-superset,mistercrunch/panoramix,dmigo/incubator-superset,apache/incubator-superset,dmigo/incubator-superset,mistercrunch/panoramix,mistercrunch/panoramix