Merge branch '2.17'

FasterXML · Feb 27, 2024 · 4b3a72a · 4b3a72a
2 parents 104c5a5 + 2b5c69f
commit 4b3a72a
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/pom.xml b/pom.xml
@@ -65,7 +65,11 @@
     <maven.compiler.source>${javac.src.version}</maven.compiler.source>
     <maven.compiler.target>${javac.target.version}</maven.compiler.target>
 
+<<<<<<< HEAD
     <project.build.outputTimestamp>2023-03-18T19:46:34Z</project.build.outputTimestamp>
+=======
+    <project.build.outputTimestamp>2024-02-27T00:41:47Z</project.build.outputTimestamp>
+>>>>>>> 2.17
   </properties>
 
   <!-- Alas, need to include snapshot reference since otherwise can not find