merge confloicts solved

2019-02-22 14:49:36 +01:00
parent 979c036b49 8b760646ab
commit 585243bb73
24 changed files with 1291 additions and 337 deletions
--- a/src/data-table/index.jsx
+++ b/src/data-table/index.jsx
@@ -2,7 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import StyleBuilder from '../style-builder';
 import DataCell from './data-cell.jsx';
-import HeaderPadding from './header-padding.jsx';
 import RowHeader from './row-header.jsx';
 import { injectSeparators } from '../utilities';