Merge remote-tracking branch 'origin/main' into core-java-collections-conversions

# Conflicts: # .idea/compiler.xml # java-collections-conversions/README.md
2023-05-09 17:07:30 -04:00
parent 43097ff34b 3db4c3efd2
commit 4ba5dc703c
1 changed files with 1 additions and 0 deletions
@@ -43,6 +43,7 @@
        <!--        <module>jackson-modules</module>-->
        <!--        <module>jackson-simple</module>-->
        <!--        <module>parent-java</module>-->
+        <module>java-collections-conversions</module>
        <module>persistence-modules</module>
        <module>testing-modules</module>
        <module>toolkits</module>