Skip to content

Commit 9cf4273

Browse files
committed
[POM]: Fixed a conflict after merging with main.
1 parent daf41f9 commit 9cf4273

1 file changed

Lines changed: 0 additions & 4 deletions

File tree

pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,7 @@
4444
</distributionManagement>
4545

4646
<properties>
47-
<<<<<<< HEAD
4847
<project.build.outputTimestamp>2023-05-10T15:47:46Z</project.build.outputTimestamp>
49-
=======
50-
<project.build.outputTimestamp>2023-05-10T15:13:30Z</project.build.outputTimestamp>
51-
>>>>>>> origin/main
5248
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5349

5450
<sonatype.server.url>s01.oss.sonatype.org</sonatype.server.url>

0 commit comments

Comments
 (0)