Skip to content

Commit

Permalink
chore: solving merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
eliasnogueira committed Jul 24, 2024
2 parents 148405b + 39d6371 commit 299adde
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<java-compiler.version>22</java-compiler.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven-surefire-plugin.version>3.3.1</maven-surefire-plugin.version>
<maven-surefire-plugin.version>3.3.0</maven-surefire-plugin.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>

<aspectj.version>1.9.22.1</aspectj.version>
Expand Down

0 comments on commit 299adde

Please sign in to comment.