fixing merge conflict (#1951)

bcgov · May 10, 2022 · c9056eb · c9056eb
1 parent d235f63
commit c9056eb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/auth-web/package-lock.json b/auth-web/package-lock.json
diff --git 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
@@ -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
@@ -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