From 8a533e59b28c306615eb3e5a415f62217780e734 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.cocm>
Date: Fri, 9 Dec 2022 19:18:28 +0800
Subject: [PATCH] resolve conflict

---
 .../schemas/schema_maya_create.json           | 93 +------------------
 1 file changed, 1 insertion(+), 92 deletions(-)

diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json
index e1a3082616..231554d96e 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json
@@ -230,98 +230,7 @@
                 }
             ]
         },
-        {
-            "type": "dict",
-            "collapsible": true,
-            "key": "CreateAss",
-            "label": "Create Ass",
-            "checkbox_key": "enabled",
-            "children": [
-                {
-                    "type": "boolean",
-                    "key": "enabled",
-                    "label": "Enabled"
-                },
-                {
-                    "type": "list",
-                    "key": "defaults",
-                    "label": "Default Subsets",
-                    "object_type": "text"
-                },
-                {
-                    "type": "boolean",
-                    "key": "expandProcedurals",
-                    "label": "Expand Procedurals"
-                },
-                {
-                    "type": "boolean",
-                    "key": "motionBlur",
-                    "label": "Motion Blur"
-                },
-                {
-                    "type": "number",
-                    "key": "motionBlurKeys",
-                    "label": "Motion Blur Keys",
-                    "minimum": 0
-                },
-                {
-                    "type": "number",
-                    "key": "motionBlurLength",
-                    "label": "Motion Blur Length",
-                    "decimal": 3
-                },
-                {
-                    "type": "boolean",
-                    "key": "maskOptions",
-                    "label": "Mask Options"
-                },
-                {
-                    "type": "boolean",
-                    "key": "maskCamera",
-                    "label": "Mask Camera"
-                },
-                {
-                    "type": "boolean",
-                    "key": "maskLight",
-                    "label": "Mask Light"
-                },
-                {
-                    "type": "boolean",
-                    "key": "maskShape",
-                    "label": "Mask Shape"
-                },
-                {
-                    "type": "boolean",
-                    "key": "maskShader",
-                    "label": "Mask Shader"
-                },
-                {
-                    "type": "boolean",
-                    "key": "maskOverride",
-                    "label": "Mask Override"
-                },
-                {
-                    "type": "boolean",
-                    "key": "maskDriver",
-                    "label": "Mask Driver"
-                },
-                {
-                    "type": "boolean",
-                    "key": "maskFilter",
-                    "label": "Mask Filter"
-                },
-                {
-                    "type": "boolean",
-                    "key": "maskColor_manager",
-                    "label": "Mask Color Manager"
-                },
-                {
-                    "type": "boolean",
-                    "key": "maskOperator",
-                    "label": "Mask Operator"
-                }
-            ]
-        },
+
         {
             "type": "schema_template",
             "name": "template_create_plugin",