fix pom merge error

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