(juneau) 02/02: Merge branch 'master' of https://gitbox.apache.org/repos/asf/juneau.git

[jamesbognar]

This is an automated email from the ASF dual-hosted git repository.

jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git

commit aafe936f1cf51d7479f2c5dc0a3da4c22cb0770b
Merge: 66171e605 30905ba1d
Author: James Bognar <james.bog...@salesforce.com>
AuthorDate: Tue Aug 26 10:39:25 2025 -0400

    Merge branch 'master' of https://gitbox.apache.org/repos/asf/juneau.git

 .../src/test/java/org/apache/juneau/assertions/AnyAssertion_Test.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --cc 
juneau-utest/src/test/java/org/apache/juneau/assertions/AnyAssertion_Test.java
index 9f4ddea01,e6876339e..14773c544
--- 
a/juneau-utest/src/test/java/org/apache/juneau/assertions/AnyAssertion_Test.java
+++ 
b/juneau-utest/src/test/java/org/apache/juneau/assertions/AnyAssertion_Test.java
@@@ -101,7 -101,7 +101,11 @@@ class AnyAssertion_Test extends SimpleT
        @Test void ba03_asJsonSorted() {
                var x1 = a(2,1);
                var nil = (Integer[])null;
++<<<<<<< HEAD
 +              var x2 = new A1();
++=======
+               Object x2 = new A1();
++>>>>>>> branch 'master' of https://gitbox.apache.org/repos/asf/juneau.git
                test(x1).asJsonSorted().is("[1,2]");
                test(x2).asJsonSorted().is("{a:1,b:2}");
                test(nil).asJsonSorted().is("null");