From 3127652d6691cb07c01b50ede97f67a0741ffee7 Mon Sep 17 00:00:00 2001
From: Krist Wongsuphasawat <krist.wongz@gmail.com>
Date: Thu, 23 Aug 2018 15:46:32 -0700
Subject: [PATCH] merge and resolve conflict

---
 .../assets/src/explore/components/ControlPanelsContainer.jsx    | 2 +-
 superset/assets/src/visualizations/word_cloud.js                | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/superset/assets/src/explore/components/ControlPanelsContainer.jsx b/superset/assets/src/explore/components/ControlPanelsContainer.jsx
index ff9754b030cdd..a2cf962ca7386 100644
--- a/superset/assets/src/explore/components/ControlPanelsContainer.jsx
+++ b/superset/assets/src/explore/components/ControlPanelsContainer.jsx
@@ -133,7 +133,7 @@ class ControlPanelsContainer extends React.Component {
               {querySectionsToRender.map(this.renderControlPanelSection)}
             </Tab>
             {displaySectionsToRender.length > 0 &&
-              <Tab eventKey="display" title="Style">
+              <Tab eventKey="display" title={t('Visual Properties')}>
                 {displaySectionsToRender.map(this.renderControlPanelSection)}
               </Tab>
             }
diff --git a/superset/assets/src/visualizations/word_cloud.js b/superset/assets/src/visualizations/word_cloud.js
index 6fdd96237e1fa..75d68e9c60cff 100644
--- a/superset/assets/src/visualizations/word_cloud.js
+++ b/superset/assets/src/visualizations/word_cloud.js
@@ -33,8 +33,6 @@ function wordCloud(element, props) {
     colorScheme,
   } = props;
 
-  console.log('data', data);
-
   const chart = d3.select(element);
   const size = [width, height];
   const rotationFn = ROTATION[rotation] || ROTATION.random;