From 67394f79e15ecb15e9b3b82ff93abce0c177e01d Mon Sep 17 00:00:00 2001
From: Vicki League <vleague@bitwarden.com>
Date: Thu, 5 Sep 2024 11:19:38 -0400
Subject: [PATCH] fix merge

---
 libs/components/src/form-field/form-field.component.ts | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/libs/components/src/form-field/form-field.component.ts b/libs/components/src/form-field/form-field.component.ts
index 15192fc6502..a32bbe7543d 100644
--- a/libs/components/src/form-field/form-field.component.ts
+++ b/libs/components/src/form-field/form-field.component.ts
@@ -8,7 +8,6 @@ import {
   HostListener,
   Input,
   ViewChild,
-  booleanAttribute,
   signal,
 } from "@angular/core";
 
@@ -68,13 +67,6 @@ export class BitFormFieldComponent implements AfterContentChecked {
     return borderClasses.join(" ");
   }
 
-  /**
-   * NOTE: Placeholder to match the API of the form-field component in the `ps/extension` branch,
-   * no functionality is implemented as of now.
-   */
-  @Input({ transform: booleanAttribute })
-  disableReadOnlyBorder = false;
-
   @HostBinding("class")
   get classList() {
     return ["tw-block", "tw-pt-2"].concat(this.disableMargin ? [] : ["tw-mb-4"]);