conflicts resolved

This commit is contained in:
Jonathan Shook
2023-09-29 18:48:30 -05:00
parent d723ebe247
commit 8d141e9ca4
2 changed files with 1 additions and 2 deletions

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>