fixed conflict

dashboard/src/main/home/dashboard/expanded-chart/ExpandedChart.tsx

@@ -102,14 +102,9 @@ export default class ExpandedChart extends Component<PropsType, StateType> {
   }
 
   renderTabContents = () => {
-<<<<<<< HEAD
     let { currentChart, refreshChart, setSidebar } = this.props;
     let chart = this.state.revisionPreview || currentChart;
     
-=======
-    let { currentChart, refreshChart, setSidebar} = this.props;
-
->>>>>>> 21e0edcb20b33dbb6af1eaa3649803a275019bdf
     if (this.state.currentTab === 'graph') {
       return (
         <GraphSection