From ee4b9056feae4f942624d6e9bf37bb64a875bfba Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Wed, 14 Sep 2022 16:51:59 +0200
Subject: [PATCH] Fix incorrectly resolved merge conflict

---
 .../schemas/projects_schema/schemas/schema_maya_capture.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
index 2e4d4d67ab..e23dbbbc1d 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
@@ -430,11 +430,6 @@
                             "key": "headsUpDisplay",
                             "label": "HUD"
                         },
-                        {
-                            "type": "boolean",
-                            "key": "hulls",
-                            "label": "hulls"
-                        },
                         {
                             "type": "boolean",
                             "key": "ikHandles",