Skip to content

Commit

Permalink
fixing merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
abdullahfathi committed Mar 7, 2022
1 parent 0957e0e commit 3205313
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions limes-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,13 @@
<!--<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>
Expand Down

0 comments on commit 3205313

Please sign in to comment.