Skip to content

Commit

Permalink
Merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
GunalKupta committed Dec 24, 2024
2 parents 13d494b + 27cb0b7 commit 0059dd4
Showing 1 changed file with 0 additions and 20 deletions.
20 changes: 0 additions & 20 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@
<module>client-encryption-hcvault</module>
<module>client-encryption</module>
<module>benchmark</module>
<module>jacoco-aggregate-schema-registry</module>
</modules>

<properties>
Expand Down Expand Up @@ -562,25 +561,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>generate-code-coverage-report</id>
<goals>
<goal>report</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>

</build>
Expand Down

0 comments on commit 0059dd4

Please sign in to comment.