From 42720baaf37827fa16b7024b365f44d8158f5a0e Mon Sep 17 00:00:00 2001
From: Travis Tidwell <travis@form.io>
Date: Fri, 7 Jun 2024 14:09:32 -0500
Subject: [PATCH] Updated version.

---
 package.json                                     | 2 +-
 src/process/validation/rules/validateRequired.ts | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/package.json b/package.json
index d32781e2..20b16004 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@formio/core",
-  "version": "2.1.0-dev.tt.12",
+  "version": "2.1.0-dev.tt.13",
   "description": "The core Form.io renderering framework.",
   "main": "lib/index.js",
   "exports": {
diff --git a/src/process/validation/rules/validateRequired.ts b/src/process/validation/rules/validateRequired.ts
index 5294f481..23733e8a 100644
--- a/src/process/validation/rules/validateRequired.ts
+++ b/src/process/validation/rules/validateRequired.ts
@@ -8,11 +8,7 @@ import {
     DayComponent
 } from 'types';
 import { isEmptyObject } from '../util';
-<<<<<<< HEAD
-import { isComponentNestedDataType } from 'utils/formUtil'
-=======
 import { isComponentNestedDataType } from 'utils/formUtil';
->>>>>>> 73c7c1ec076f88b1d3ef940f41422f04a3aaaafa
 import { ProcessorInfo } from 'types/process/ProcessorInfo';
 
 const isAddressComponent = (component: any): component is AddressComponent => {