Skip to content
Snippets Groups Projects
Commit 7a131415 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

remove conflict

parent 85fa468a
No related branches found
No related tags found
2 merge requests!1700Resolve "introduce new frontend to the jar file build process",!1650Resolve "fix install tests"
Pipeline #85110 failed
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 0 deletions
service/pom.xml
+ 4
− 0
View file @ 7a131415
...@@ -161,6 +161,10 @@ ...@@ -161,6 +161,10 @@
<version>${greenmail.version}</version> <version>${greenmail.version}</version>
<scope>test</scope> <scope>test</scope>
<exclusions> <exclusions>
<exclusion>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
</exclusion>
<exclusion> <exclusion>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment