From 1b22e41e8369b79ce45a291c2e3a3a86207a4224 Mon Sep 17 00:00:00 2001
From: Chris Frohoff <chris@frohoff.org>
Date: Tue, 26 Apr 2022 23:01:50 -0700
Subject: [PATCH] fix pom merge error

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ee1fbc6..464d378 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>