conflicts resolved

This commit is contained in:
Jonathan Shook committed 2023-10-23 08:39:45 -05:00
1 parent d723ebe247
commit 8d141e9ca4
2 files changed
+1 -2

No files matched your search

-1
View File
@@ -35,7 +35,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<javadoc.name>nosqlbench</javadoc.name>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
+1 -1
View File
@@ -170,7 +170,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.4.3</version>
<version>3.4.5</version>
</plugin>
</plugins>
</reporting>