From 6ab5cc149ebbe60f3e03a2eb5dacb22288a29b8c Mon Sep 17 00:00:00 2001
From: rojas <rojas@N619>
Date: Wed, 11 Sep 2024 11:29:44 -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 36c61d2569..9ab3ae8295 100644
--- a/nbproject/nbjdk.properties
+++ b/nbproject/nbjdk.properties
@@ -1 +1 @@
-nbjdk.active=default_platform
+nbjdk.active=JDK_22
-- 
GitLab