[Bf-blender-cvs] [cddda706188] master: Geometry Nodes: Merge Conflict Cleanup

[Johnny Matthews]

Commit: cddda706188a9ebb14ddbfbed5651f321ef31522
Author: Johnny Matthews
Date:   Thu Oct 14 12:22:33 2021 -0500
Branches: master
https://developer.blender.org/rBcddda706188a9ebb14ddbfbed5651f321ef31522

Geometry Nodes: Merge Conflict Cleanup

Removing a line that remained from a merge.

===================================================================

M	release/scripts/startup/nodeitems_builtins.py

===================================================================

diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py
index b26454e0313..932a6ba853d 100644
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -143,7 +143,6 @@ def mesh_node_items(context):
         yield NodeItem("GeometryNodeLegacySubdivisionSurface", poll=geometry_nodes_legacy_poll)
         yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
 
-    yield NodeItem("GeometryNodeEdgeSplit")
     yield NodeItem("GeometryNodeMeshBoolean")
     yield NodeItem("GeometryNodeMeshToCurve")
     yield NodeItem("GeometryNodeMeshToPoints")