From 8b04f65225628529f73cbbff934cc6afe635d99e Mon Sep 17 00:00:00 2001
From: Viicos <65306057+Viicos@users.noreply.github.com>
Date: Mon, 30 Oct 2023 12:30:33 +0100
Subject: [PATCH] fix merge again

---
 src/formio/index.ts | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/formio/index.ts b/src/formio/index.ts
index b07f702..1ada62f 100644
--- 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;