From d8f0d4f7a4aefc4be5d4dd44a3cc7f98977234c0 Mon Sep 17 00:00:00 2001
From: rojas <rojas@N619>
Date: Thu, 12 Sep 2024 08:26:26 -0700
Subject: [PATCH] Merge origin/master
Conflicts:
examples/nbproject/project.properties
---
assignments/nbproject/project.properties | 2 +-
assignments/nbproject/project.xml | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/assignments/nbproject/project.properties b/assignments/nbproject/project.properties
index acc52782ce..9003d11a34 100644
--- a/assignments/nbproject/project.properties
+++ b/assignments/nbproject/project.properties
@@ -113,7 +113,7 @@ manifest.custom.codebase=
manifest.custom.permissions=
meta.inf.dir=${src.dir}/META-INF
mkdist.disabled=false
-platform.active=JDK_22
+platform.active=default_platform
project.licensePath=../license.txt
run.classpath=\
${javac.classpath}:\
diff --git a/assignments/nbproject/project.xml b/assignments/nbproject/project.xml
index f4711c4a46..ec9c9401e0 100644
--- a/assignments/nbproject/project.xml
+++ b/assignments/nbproject/project.xml
@@ -4,7 +4,6 @@
<configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>Networked Graphics MV3500 assignments</name>
- <explicit-platform explicit-source-supported="true"/>
<source-roots>
<root id="src.dir"/>
</source-roots>
--
GitLab