fix rebase error

graycoreio · Feb 3, 2025 · aaf5e9d · aaf5e9d
1 parent 1d8e33e
commit aaf5e9d
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/libs/design/src/atoms/form/form-field/form-field/form-field.component.spec.ts b/libs/design/src/atoms/form/form-field/form-field/form-field.component.spec.ts
@@ -23,8 +23,7 @@ import { DaffFormFieldMissingControlMessage } from '../form-field-errors';
     <input daff-input [formControl]="formControl">
     <daff-error-message></daff-error-message>
   </daff-form-field>`,
-  standalone: false,
-})
+standalone: false })
 class WrapperComponent {
   formControl = new UntypedFormControl('', Validators.required);
 }
@@ -118,18 +117,11 @@ describe('@daffodil/design | DaffFormFieldComponent | Usage', () => {
 
 });
 
-<<<<<<< HEAD
-@Component({
-  template: `
-  <daff-form-field [formSubmitted]="formSubmittedValue">
-=======
 @Component({ template: `
   <daff-form-field>
->>>>>>> fix tests
     <daff-error-message></daff-error-message>
   </daff-form-field>`,
-  standalone: false,
-})
+standalone: false })
 
 class WrapperWithoutControlComponent {}