fix: Merge conflicts

Author: givingwu

.gitignore

@@ -20,4 +20,4 @@ package-lock.json
 *.njsproj
 *.sln
 *.sw?
-*.lock
+*.lock

README.md

@@ -247,8 +247,8 @@ export default {
   ellipsis: BOOLEAN_FALSE_PROP,
   expandable: BOOLEAN_FALSE_PROP,
 
-  render: Function, // BodyRowCell Render: VNode|({ store: TableStore, row: RowModel, column: ColumnConfig }) => VNode
-  renderHeader: Function, // HeaderRowCell Render: VNode|({ store, row, column }) => VNode
+  render: Function, // BodyRowCellRender: VNode|({ store: TableStore, row: RowModel, column: ColumnConfig }) => VNode
+  renderHeader: Function, // HeaderRowCellRender: VNode|({ store, row, column }) => VNode
 
   // TODO
   resizable: BOOLEAN_FALSE_PROP

babel.config.js

@@ -1,3 +1,3 @@
 module.exports = {
-  presets: ["@vue/cli-plugin-babel/preset"],
+  presets: ['@vue/cli-plugin-babel/preset']
 }