iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolved conflict: 

#	image-processing/pom.xml
This commit is contained in:
Maja Joksovic 2020-07-06 23:14:57 +02:00
parent a53a819bd0 a5f4340e19
commit 0d55264d78
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
image-processing/pom.xml
View File

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