Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-07-04 03:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Java' of https://gitlab.com/chameleon-vision/Chameleon-Vision into Java

Browse Source 
# Conflicts:
#	Main/pom.xml
This commit is contained in:
Banks Troutman
2019-09-15 15:13:29 -04:00
parent f26b7df000 4178b3d6de
commit 588dfdab54
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Main/pom.xml
View File

@@ -84,12 +84,6 @@
<artifactId>wpiutil-java</artifactId> <artifactId>wpiutil-java</artifactId>
<version>RELEASE</version> <version>RELEASE</version>
</dependency> </dependency>
<!-- <dependency>-->
<!-- &lt;!&ndash;opencv libs for java&ndash;&gt;-->
<!-- <groupId>org.opencv</groupId>-->
<!-- <artifactId>opencv-java</artifactId>-->
<!-- <version>RELEASE</version>-->
<!-- </dependency>-->
<dependency> <dependency>
<!--apache common classes libs--> <!--apache common classes libs-->
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
@@ -103,12 +97,6 @@
<version>RELEASE</version> <version>RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<<<<<<< HEAD
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>5.1.9.RELEASE</version>
</dependency>
=======
<groupId>edu.wpi.first.thirdparty.frc2019.opencv</groupId> <groupId>edu.wpi.first.thirdparty.frc2019.opencv</groupId>
<artifactId>opencv-java</artifactId> <artifactId>opencv-java</artifactId>
<version>3.4.4-5</version> <version>3.4.4-5</version>
@@ -136,7 +124,10 @@
<version>3.4.4-5</version> <version>3.4.4-5</version>
<classifier>linuxraspbian</classifier> <classifier>linuxraspbian</classifier>
</dependency> </dependency>
<dependency>
>>>>>>> folderStructure <groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>5.1.9.RELEASE</version>
</dependency>
</dependencies> </dependencies>
</project> </project>