Skip to content

Commit

Permalink
Merge branch 'feature/jdk-21' into feature/xattr
Browse files Browse the repository at this point in the history 
# Conflicts:
#	.idea/misc.xml
  • Loading branch information
@overheadhunter
overheadhunter committed Sep 6, 2023
2 parents 701ab9e + baff27c commit 0dc5847
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .idea/misc.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 0dc5847

Please sign in to comment.