fix pom merge error

This commit is contained in:
Chris Frohoff
2022-04-26 23:01:50 -07:00
parent be6cbf7f13
commit 1b22e41e83
+1 -1
View File
@@ -102,7 +102,6 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- non-gadget dependencies --> <!-- non-gadget dependencies -->
<dependency> <dependency>
@@ -330,6 +329,7 @@
<groupId>org.scala-lang</groupId> <groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId> <artifactId>scala-library</artifactId>
<version>2.12.6</version> <version>2.12.6</version>
</dependency>
<dependency> <dependency>
<groupId>com.atomikos</groupId> <groupId>com.atomikos</groupId>
<artifactId>transactions-osgi</artifactId> <artifactId>transactions-osgi</artifactId>