We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent daf41f9 commit 9cf4273Copy full SHA for 9cf4273
1 file changed
pom.xml
@@ -44,11 +44,7 @@
44
</distributionManagement>
45
46
<properties>
47
-<<<<<<< HEAD
48
<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
52
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
53
54
<sonatype.server.url>s01.oss.sonatype.org</sonatype.server.url>
0 commit comments