revert modify after rebase

ng2-components/ng2-alfresco-datatable/README.md

@@ -227,7 +227,6 @@ You can add a template that will be shown when there are no results in your data
     [data]="data"
     [actions]="contentActions"
     [multiselect]="multiselect"
-    [loading]=isLoading()"
     (showRowContextMenu)="onShowRowContextMenu($event)"
     (showRowActionsMenu)="onShowRowActionsMenu($event)"
     (executeRowAction)="onExecuteRowAction($event)"

ng2-components/ng2-alfresco-datatable/config/webpack.common.js

@@ -8,8 +8,6 @@ const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
 
 const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
 
-const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
-
 module.exports = {
 
     resolveLoader: {

ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts

@@ -226,6 +226,7 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck
         if (this.data) {
             this.data.setRows(this.convertToRowsData(rows));
         }
+    }
 
     private setTableSchema() {
         if (this.columnList && this.columnList.columns) {