From df4edd0fde3c9c748ffd13669a1a48a7f76c4bda Mon Sep 17 00:00:00 2001
From: rojas <rojas@N619>
Date: Wed, 11 Sep 2024 11:22:31 -0700
Subject: [PATCH] Merge origin/master

Conflicts:
	examples/nbproject/project.properties
---
 nbproject/nbjdk.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nbproject/nbjdk.properties b/nbproject/nbjdk.properties
index 9ab3ae8295..36c61d2569 100644
--- a/nbproject/nbjdk.properties
+++ b/nbproject/nbjdk.properties
@@ -1 +1 @@
-nbjdk.active=JDK_22
+nbjdk.active=default_platform
-- 
GitLab