From 52fc84899b2fdfe76d7b7b84fa29c1c9792b95db Mon Sep 17 00:00:00 2001
From: AllenFang <ayu780129@hotmail.com>
Date: Wed, 5 Sep 2018 23:20:36 +0800
Subject: [PATCH] fixed wrong conflict fixs for #514

---
 .../react-bootstrap-table2-editor/src/editing-cell-binder.js  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react-bootstrap-table2-editor/src/editing-cell-binder.js b/packages/react-bootstrap-table2-editor/src/editing-cell-binder.js
index 0a9ef77..b3dc6bd 100644
--- a/packages/react-bootstrap-table2-editor/src/editing-cell-binder.js
+++ b/packages/react-bootstrap-table2-editor/src/editing-cell-binder.js
@@ -3,8 +3,8 @@ import React from 'react';
 import { Consumer } from './context';
 import createEditingCell from './editing-cell';
 
-export default (_) => {
-  const EditingCell = createEditingCell(_);
+export default (_, onStartEdit) => {
+  const EditingCell = createEditingCell(_, onStartEdit);
   const renderWithEditingCell = (props, cellEdit) => {
     const content = _.get(props.row, props.column.dataField);
     let editCellstyle = props.column.editCellStyle || {};