From 80d605278891b3259c59e5ea6b012edb7f17de48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Oliveira?= <josepfo.w@gmail.com>
Date: Tue, 16 Nov 2021 11:44:26 +0000
Subject: [PATCH] fix: remove rebase leftovers

---
 .../src/pages/Customers/CustomerProfile.js    | 24 -------------------
 .../Customers/components/EditableCard.js      |  5 ----
 2 files changed, 29 deletions(-)

diff --git a/new-lamassu-admin/src/pages/Customers/CustomerProfile.js b/new-lamassu-admin/src/pages/Customers/CustomerProfile.js
index 01049c41..6652b4d2 100644
--- a/new-lamassu-admin/src/pages/Customers/CustomerProfile.js
+++ b/new-lamassu-admin/src/pages/Customers/CustomerProfile.js
@@ -262,30 +262,6 @@ const CustomerProfile = memo(() => {
             </div>
           )}
         </div>
-        <div className={classes.rightSidePanel}>
-          {isOverview && (
-            <div>
-              <Box
-                className={classes.customerDetails}
-                display="flex"
-                justifyContent="space-between">
-                <CustomerDetails
-                  customer={customerData}
-                  locale={locale}
-                  setShowCompliance={() => setShowCompliance(!showCompliance)}
-                />
-              </Box>
-              <div>
-                <TransactionsList
-                  customer={customerData}
-                  data={sortedTransactions}
-                  locale={locale}
-                  loading={loading}
-                />
-              </div>
-            </div>
-          )}
-        </div>
         <div className={classes.rightSidePanel}>
           {isOverview && (
             <div>
diff --git a/new-lamassu-admin/src/pages/Customers/components/EditableCard.js b/new-lamassu-admin/src/pages/Customers/components/EditableCard.js
index 1756b635..a97023dc 100644
--- a/new-lamassu-admin/src/pages/Customers/components/EditableCard.js
+++ b/new-lamassu-admin/src/pages/Customers/components/EditableCard.js
@@ -123,12 +123,7 @@ const EditableCard = ({
     [classes.label1Rejected]: state === OVERRIDE_REJECTED,
     [classes.label1Accepted]: state === OVERRIDE_AUTHORIZED
   }
-<<<<<<< HEAD
 
-=======
-  const isNotAuthorized =
-    state === OVERRIDE_REJECTED || state === OVERRIDE_PENDING
->>>>>>> feat: add dynamic position to editable cards, reject/authorize buttons
   const authorized =
     state === OVERRIDE_PENDING
       ? { label: 'Pending', type: 'neutral' }