mindol1004/spring-boot-rest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolved conflict:

Browse Source 
#	image-processing/pom.xml
This commit is contained in:
Maja Joksovic
2020-07-06 23:14:57 +02:00
parent 1c3c15366b 06563f464c
commit 88d30d4cbf
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
image-processing/pom.xml
View File

@@ -39,7 +39,7 @@
<dependency> <dependency>
<groupId>org.openpnp</groupId> <groupId>org.openpnp</groupId>
<artifactId>opencv</artifactId> <artifactId>opencv</artifactId>
<version>3.4.2-0</version> <version>${opencv.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>
@@ -93,5 +93,6 @@
<imgscalr-version>4.2</imgscalr-version> <imgscalr-version>4.2</imgscalr-version>
<thumbnailator-version>0.4.11</thumbnailator-version> <thumbnailator-version>0.4.11</thumbnailator-version>
<marvin-version>1.5.5</marvin-version> <marvin-version>1.5.5</marvin-version>
<opencv.version>3.4.2-0</opencv.version>
</properties> </properties>
</project> </project>