fixing merge conflicts

dice-group · Mar 7, 2022 · 274d164 · 274d164
1 parent 3205313
commit 274d164
Showing 1 changed file with 15 additions and 34 deletions.
diff --git a/limes-core/pom.xml b/limes-core/pom.xml
@@ -92,15 +92,6 @@
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
             <version>1.7.35</version>
-<<<<<<< HEAD
-=======
-        </dependency>
-
-	   <dependency>
-            <groupId>org.aksw.commons</groupId>
-   			<artifactId>aksw-commons-util</artifactId>
-            <version>0.8.14</version>
->>>>>>> dev
         </dependency>
 
         <dependency>
@@ -168,15 +159,6 @@
             </exclusions>
         </dependency>
         <dependency>
-<<<<<<< HEAD
-=======
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-web</artifactId>
-            <version>2.17.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
->>>>>>> dev
             <groupId>org.aksw.jena-sparql-api</groupId>
             <artifactId>jena-sparql-api-core</artifactId>
             <version>3.17.0-1</version>
@@ -288,18 +270,24 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <!--<dependency>-->
+        <!--<groupId>org.geotools</groupId>-->
+        <!--<artifactId>gt-main</artifactId>-->
+        <!--<version>20.2</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+        <!--<groupId>org.opengis</groupId>-->
+        <!--<artifactId>geoapi</artifactId>-->
+        <!--<version>3.0.1</version>-->
+        <!--<type>bundle</type>-->
+        <!--</dependency>-->
 
-        <!--geotools-->
-
-
-    <dependency>
+          <dependency>
 	<groupId>io.oss84.geotools</groupId>
 	<artifactId>gt-main</artifactId>
 	<version>24.2-oss84-1</version>
-</dependency>
-<!-- Thanks for using https://jar-download.com -->
-
- <!--geotools-->
+    </dependency>
+
         <dependency>
             <groupId>org.locationtech.jts</groupId>
             <artifactId>jts</artifactId>
@@ -419,13 +407,6 @@
         <!--<artifactId>commons-fileupload</artifactId>-->
         <!--<version>1.3.2</version>-->
         <!--</dependency>-->
-
-           <dependency>
-	<groupId>io.oss84.geotools</groupId>
-	<artifactId>gt-main</artifactId>
-	<version>24.2-oss84-1</version>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>fluent-hc</artifactId>
@@ -459,4 +440,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project