From 38bb4f3f3c24829a0760b527d6a33e5c83e0bd7f Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Tue, 23 Apr 2019 13:27:00 -0400
Subject: [PATCH] Fix merge conflicts

---
 .../DataListToolbar/DataListToolbar.jsx       | 22 ++++++-------------
 src/contexts/Config.jsx                       |  2 +-
 .../components/OrganizationAccessList.jsx     |  4 ----
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/components/DataListToolbar/DataListToolbar.jsx b/src/components/DataListToolbar/DataListToolbar.jsx
index a4e6428253..3d8992c69f 100644
--- a/src/components/DataListToolbar/DataListToolbar.jsx
+++ b/src/components/DataListToolbar/DataListToolbar.jsx
@@ -37,13 +37,11 @@ class DataListToolbar extends React.Component {
       isCompact,
       noLeftMargin,
       onSort,
-      onSearch
+      onSearch,
       onCompact,
       onExpand,
       onOpenDeleteModal,
-      onSearch,
       onSelectAll,
-      onSort,
       showAdd,
       showDelete,
       showSelectAll,
@@ -160,7 +158,10 @@ DataListToolbar.propTypes = {
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
   deleteTooltip: PropTypes.node,
   isAllSelected: PropTypes.bool,
+  isCompact: PropTypes.bool,
   noLeftMargin: PropTypes.bool,
+  onCompact: PropTypes.func,
+  onExpand: PropTypes.func,
   onSearch: PropTypes.func,
   onSelectAll: PropTypes.func,
   onSort: PropTypes.func,
@@ -168,11 +169,7 @@ DataListToolbar.propTypes = {
   showDelete: PropTypes.bool,
   showSelectAll: PropTypes.bool,
   sortOrder: PropTypes.string,
-  sortedColumnKey: PropTypes.string,
-  onCompact: PropTypes.func,
-  onExpand: PropTypes.func,
-  isCompact: PropTypes.bool,
-  add: PropTypes.node
+  sortedColumnKey: PropTypes.string
 };
 
 DataListToolbar.defaultProps = {
@@ -181,6 +178,7 @@ DataListToolbar.defaultProps = {
   deleteTooltip: i18nMark('Delete'),
   isAllSelected: false,
   isCompact: false,
+  noLeftMargin: false,
   onCompact: null,
   onExpand: null,
   onSearch: null,
@@ -190,13 +188,7 @@ DataListToolbar.defaultProps = {
   showDelete: false,
   showSelectAll: false,
   sortOrder: 'ascending',
-  sortedColumnKey: 'name',
-  isAllSelected: false,
-  onCompact: null,
-  onExpand: null,
-  isCompact: false,
-  add: null,
-  noLeftMargin: false
+  sortedColumnKey: 'name'
 };
 
 export default DataListToolbar;
diff --git a/src/contexts/Config.jsx b/src/contexts/Config.jsx
index 10595a7d90..ab4bfed202 100644
--- a/src/contexts/Config.jsx
+++ b/src/contexts/Config.jsx
@@ -124,7 +124,7 @@ class Provider extends Component {
     return (
       <ConfigContext.Provider
         value={{
-          ...(propsValue || stateValue),
+          ...value,
           fetchMe: this.fetchMe,
           updateConfig: this.updateConfig
         }}
diff --git a/src/pages/Organizations/components/OrganizationAccessList.jsx b/src/pages/Organizations/components/OrganizationAccessList.jsx
index 3d534ad066..53b3dc4d5d 100644
--- a/src/pages/Organizations/components/OrganizationAccessList.jsx
+++ b/src/pages/Organizations/components/OrganizationAccessList.jsx
@@ -18,10 +18,6 @@ import {
   withRouter
 } from 'react-router-dom';
 
-import {
-  PlusIcon,
-} from '@patternfly/react-icons';
-
 import { withNetwork } from '../../../contexts/Network';
 
 import AlertModal from '../../../components/AlertModal';