fix conflict

dragonsuperf · Mar 27, 2021 · 807259d · 807259d
1 parent 8c0599a
commit 807259d
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/src/components/chart/CandleStickChart.tsx b/src/components/chart/CandleStickChart.tsx
@@ -6,17 +6,10 @@ import ChartLoading from './ChartLoading';
 
 const ChartItem = styled.div`
   flex-grow: 1;
-<<<<<<< HEAD
   border-left: 1px solid ${(props) => props.theme.themeColor};
   margin: 5px;
   margin-bottom: 18px;
   min-height: 350px;
-=======
-  border: 1px solid ${(props) => props.theme.weakBorder};
-  margin-bottom: 12px;
-  margin-right: 5px;
-  border-radius: 5px;
->>>>>>> 222fe3d4527802c69ad54e7de733d0ae5f6e4e44
 `;
 
 interface ChartProps {