Skip to content
Snippets Groups Projects
Commit df4edd0f authored by rojas's avatar rojas
Browse files

Merge origin/master 

Conflicts:
	examples/nbproject/project.properties
parent 4fb31633
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
nbproject/nbjdk.properties
+ 1
− 1
View file @ df4edd0f
nbjdk.active=JDK_22
nbjdk.active=default_platform
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment