Skip to content

Commit

Permalink
Merge branch 'main' into gh-3368
Browse files Browse the repository at this point in the history
# Conflicts:
#	assertj-core/src/main/java/org/assertj/core/api/InstanceOfAssertFactories.java
#	assertj-core/src/test/java/org/assertj/core/api/InstanceOfAssertFactoriesTest.java
  • Loading branch information
scordio committed Mar 24, 2024
2 parents f14f01d + d5eba81 commit 15726cb
Show file tree
Hide file tree
Showing 2 changed files with 227 additions and 226 deletions.
Expand Up @@ -495,6 +495,7 @@ static <ELEMENT> InstanceOfAssertFactory<ELEMENT[][], Object2DArrayAssert<ELEMEN

/**
* {@link InstanceOfAssertFactory} for a {@link Temporal}.
*
* @since 3.26.0
*/
InstanceOfAssertFactory<Temporal, TemporalAssert> TEMPORAL = new InstanceOfAssertFactory<>(Temporal.class,
Expand Down Expand Up @@ -559,7 +560,7 @@ static <ELEMENT> InstanceOfAssertFactory<ELEMENT[][], Object2DArrayAssert<ELEMEN
Assertions::assertThat);

/**
* {@link InstanceOfAssertFactory} for a {@link java.time.Period}.
* {@link InstanceOfAssertFactory} for a {@link Period}.
*
* @since 3.17.0
*/
Expand Down

0 comments on commit 15726cb

Please sign in to comment.