From c9056eb7ebaa0b90e617f1f688d941db65ec9dc6 Mon Sep 17 00:00:00 2001
From: Alex Lambert <60455392+lambert-alex@users.noreply.github.com>
Date: Tue, 10 May 2022 15:35:45 -0700
Subject: [PATCH] fixing merge conflict (#1951)

---
 auth-web/package-lock.json                                    | 4 ++--
 auth-web/package.json                                         | 2 +-
 .../components/auth/manage-business/AffiliatedEntityTable.vue | 2 +-
 .../src/components/auth/manage-business/EntityManagement.vue  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/auth-web/package-lock.json b/auth-web/package-lock.json
index 4f7d6e2261..50c7db7c1c 100644
--- a/auth-web/package-lock.json
+++ b/auth-web/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "auth-web",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "auth-web",
-      "version": "1.0.0",
+      "version": "1.0.1",
       "dependencies": {
         "@bcrs-shared-components/bread-crumb": "^1.0.2",
         "@bcrs-shared-components/corp-type-module": "1.0.6",
diff --git a/auth-web/package.json b/auth-web/package.json
index 0e52d4407b..5b5f6747da 100644
--- a/auth-web/package.json
+++ b/auth-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "auth-web",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
diff --git a/auth-web/src/components/auth/manage-business/AffiliatedEntityTable.vue b/auth-web/src/components/auth/manage-business/AffiliatedEntityTable.vue
index 2667e5305a..34486f2138 100644
--- a/auth-web/src/components/auth/manage-business/AffiliatedEntityTable.vue
+++ b/auth-web/src/components/auth/manage-business/AffiliatedEntityTable.vue
@@ -661,7 +661,7 @@ export default class AffiliatedEntityTable extends Mixins(DateMixin) {
 // Custom Scroll bars
 #affiliated-entity-table {
   ::v-deep .v-menu__content {
-    margin-left: -6rem;
+    margin-left: -5rem;
     margin-right: 1rem;
     text-align: left;
     position: sticky;
diff --git a/auth-web/src/components/auth/manage-business/EntityManagement.vue b/auth-web/src/components/auth/manage-business/EntityManagement.vue
index 0d9fa09531..74619a6c68 100644
--- a/auth-web/src/components/auth/manage-business/EntityManagement.vue
+++ b/auth-web/src/components/auth/manage-business/EntityManagement.vue
@@ -263,8 +263,8 @@ export default class EntityManagement extends Mixins(AccountChangeMixin, NextPag
   private readonly createNumberedBusiness!: (accountId: Number) => Promise<void>
   private readonly currentOrgAddress!: Address
   private readonly syncAddress!: () => Address
-  private selectedColumns = ['Number', 'Type', 'Status', 'Last Modified', 'Modified By']
-  private columns = ['Number', 'Type', 'Status', 'Last Modified', 'Modified By']
+  private selectedColumns = ['Number', 'Type', 'Status']
+  private columns = ['Number', 'Type', 'Status']
 
   $refs: {
     successDialog: ModalDialog