docs: rewrite unnecessary file change

antvis · Aug 25, 2020 · bb4b134 · bb4b134
1 parent 960175c
commit bb4b134
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 36 deletions.
diff --git a/docs/common/shape-style.en.md b/docs/common/shape-style.en.md
@@ -32,4 +32,5 @@
     shadowOffsetY: 5,
     cursor: 'pointer'
   }
+}
 ```
diff --git a/examples/scatter/basic/API.en.md b/examples/scatter/basic/API.en.md
@@ -172,17 +172,8 @@ scatterPlot.render();
 
 #### shape ✨
 
-<<<<<<< HEAD
-
 [**DEMO2**](../../scatter/basic#shape-mapping)
 
-=======
-
-[**DEMO2**](../../scatter/basic#shape-mapping)
-
-> > > > > > > a6bca564... docs: 添加图表通用配置 (#1439)
-> > > > > > > **可选**, \_string | string[] | Function\_
-
 功能描述： 指定点的形状。如没有配置 shapeField ，指定一个即可。对 shapeField 进行了配置的情况下，可以指定形状数组 `['cicle', 'square']`， 也可以通过回调函数的方法根据对应数值进行设置。
 
 内置图形：circle, square, bowtie, diamond, hexagon, triangle,triangle-down, hollow-circle, hollow-square, hollow-bowtie,hollow-diamond, hollow-hexagon, hollow-triangle, hollow-triangle-down, cross, tick, plus, hyphen, line.
@@ -259,8 +250,6 @@ scatterPlot.render();
 }
 ```
 
-<<<<<<< HEAD
-
 ### tooltip
 
 `markdown:common/tooltip.en.md`
@@ -272,7 +261,6 @@ xAxis、yAxis 配置相同。
 `markdown:common/axis.en.md`
 
 <!--`markdown:common/legend.en.md`
-<<<<<<< HEAD
 `markdown:common/theme.en.md` -->
 
 ### 事件
@@ -314,29 +302,6 @@ scatterPlot.on('element:click', (...args) => {
 
 #### 图表方法
 
-=======
-
-### 图表组件
-
-=======
-
-### tooltip
-
-> > > > > > > 3aa0cb2c... docs: 添加 axis (#1465)
-
-`markdown:common/tooltip.en.md`
-
-### axis
-
-xAxis、yAxis 配置相同。
-
-`markdown:common/axis.en.md`
-
-<!-- `markdown:common/xAxis.en.md`
-`markdown:common/yAxis.en.md`
-`markdown:common/legend.en.md`
-=======
->>>>>>> 2b1c85cd... docs: 统一通用文档样式 (#1470)
 `markdown:common/theme.en.md` -->
 
 ### 事件

diff --git a/src/core/plot.ts b/src/core/plot.ts
@@ -4,7 +4,7 @@ import { deepMix, each } from '@antv/util';
 import EE from '@antv/event-emitter';
 import { bind } from 'size-sensor';
 import { Adaptor } from './adaptor';
-import { Options, StateName, StateCondition, Size, StateObject } from '../types';
+import { Options, Data, StateName, StateCondition, Size, StateObject } from '../types';
 import { getContainerSize, getAllElements } from '../utils';
 
 /** 单独 pick 出来的用于基类的类型定义 */
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,4 +32,5 @@ @@
         shadowOffsetY: 5,
         cursor: 'pointer'
       }
+    }
     ```