From 53e18abe4f4bf026dbf8e2f828dd718c9e7aa61d Mon Sep 17 00:00:00 2001
From: Thomas Rittson <trittson@bitwarden.com>
Date: Thu, 21 Oct 2021 14:51:24 +1000
Subject: [PATCH] Fix merge errors

---
 src/app/vault/vault.component.html | 31 +-----------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/src/app/vault/vault.component.html b/src/app/vault/vault.component.html
index d2b81972..b577a190 100644
--- a/src/app/vault/vault.component.html
+++ b/src/app/vault/vault.component.html
@@ -8,7 +8,7 @@
                 (onTrashClicked)="filterDeleted()">
             </app-vault-groupings>
         </div>
-        <div class="col-6">
+        <div class="col-12 col-md-8 col-lg-9 mt-4 mt-md-0">
             <div class="page-header d-flex">
                 <h1>
                     {{'myVault' | i18n}}
@@ -98,35 +98,6 @@
                 </div>
             </div>
         </div>
-        <div class="col-12 col-md-8 col-lg-9 mt-4 mt-md-0">
-            <div class="page-header d-flex">
-                <h1>
-                    {{'myVault' | i18n}}
-                    <small #actionSpinner [appApiAction]="ciphersComponent.actionPromise">
-                        <ng-container *ngIf="actionSpinner.loading">
-                            <i class="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}"
-                                aria-hidden="true"></i>
-                            <span class="sr-only">{{'loading' | i18n}}</span>
-                        </ng-container>
-                    </small>
-                </h1>
-                <div class="ml-auto d-flex">
-                    <app-vault-bulk-actions [ciphersComponent]="ciphersComponent" [modal]="modal" [deleted]="deleted">
-                    </app-vault-bulk-actions>
-                    <button type="button" class="btn btn-primary btn-sm" (click)="addCipher()" *ngIf="!deleted">
-                        <i class="fa fa-plus fa-fw" aria-hidden="true"></i>{{'addItem' | i18n}}
-                    </button>
-                </div>
-            </div>
-            <app-callout type="warning" *ngIf="deleted" icon="fa-warning">
-                {{trashCleanupWarning}}
-            </app-callout>
-            <app-vault-ciphers (onCipherClicked)="editCipher($event)"
-                (onAttachmentsClicked)="editCipherAttachments($event)" (onAddCipher)="addCipher()"
-                (onShareClicked)="shareCipher($event)" (onCollectionsClicked)="editCipherCollections($event)"
-                (onCloneClicked)="cloneCipher($event)">
-            </app-vault-ciphers>
-        </div>
     </div>
 </div>
 <ng-template #attachments></ng-template>