Skip to content

Commit

Permalink
Fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@kaklakariada
kaklakariada committed Sep 1, 2024
1 parent 85b3277 commit 368256d
Showing 1 changed file with 0 additions and 19 deletions.
19 changes: 0 additions & 19 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,25 +70,6 @@
</toolchains>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<goals>
<goal>toolchain</goal>
</goals>
</execution>
</executions>
<configuration>
<toolchains>
<jdk>
<version>${java.version}</version>
</jdk>
</toolchains>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down

0 comments on commit 368256d

Please sign in to comment.