fix merge again

open-formulieren · Oct 30, 2023 · 8b04f65 · 8b04f65
1 parent f3bf4a0
commit 8b04f65
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/src/formio/index.ts b/src/formio/index.ts
@@ -51,16 +51,13 @@ export type AnyComponentSchema =
   | PostcodeComponentSchema
   | FileComponentSchema
   | NumberComponentSchema
-<<<<<<< HEAD
+  | CheckboxComponentSchema
+  | SelectboxesComponentSchema
   | CurrencyComponentSchema
+  | RadioComponentSchema
   // special types
   | IbanComponentSchema
   | LicensePlateComponentSchema
-=======
-  | CheckboxComponentSchema
-  | SelectboxesComponentSchema
-  | RadioComponentSchema
->>>>>>> dab8ef2 (✨ [#2] Apply feedback and add `radio` component)
   // layout
   | ContentComponentSchema;