From 4525179cedc4ee36913e99c6546a509fb9f65bd0 Mon Sep 17 00:00:00 2001 From: rojas <rojas@N619> Date: Tue, 27 Aug 2024 11:01:26 -0700 Subject: [PATCH] Merge origin/master Conflicts: examples/nbproject/project.properties --- examples/nbproject/project.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/nbproject/project.xml b/examples/nbproject/project.xml index bd4589c403..d7c8e3fd3b 100644 --- a/examples/nbproject/project.xml +++ b/examples/nbproject/project.xml @@ -4,7 +4,6 @@ <configuration> <data xmlns="http://www.netbeans.org/ns/j2se-project/3"> <name>Networked Graphics MV3500 examples</name> - <explicit-platform explicit-source-supported="true"/> <source-roots> <root id="src.dir"/> <root id="src.src.dir"/> -- GitLab