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

Merge branch 'folderStructure' into Java

Browse Source 
# Conflicts:
#	Main/pom.xml
#	Main/src/main/java/com/chameleonvision/web/Server.java
This commit is contained in:
Banks Troutman
2019-09-15 15:11:26 -04:00
parent e80f35b39f 25652ba32e
commit f26b7df000
14 changed files with 183 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Main/pom.xml
View File

@@ -103,9 +103,40 @@
<version>RELEASE</version>
</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>
<artifactId>opencv-java</artifactId>
<version>3.4.4-5</version>
</dependency>
<dependency>
<groupId>edu.wpi.first.thirdparty.frc2019.opencv</groupId>
<artifactId>opencv-jni</artifactId>
<version>3.4.4-5</version>
<classifier>windowsx86-64</classifier>
</dependency> <dependency>
<groupId>edu.wpi.first.thirdparty.frc2019.opencv</groupId>
<artifactId>opencv-jni</artifactId>
<version>3.4.4-5</version>
<classifier>linuxx86-64</classifier>
</dependency>
<dependency>
<groupId>edu.wpi.first.thirdparty.frc2019.opencv</groupId>
<artifactId>opencv-jni</artifactId>
<version>3.4.4-5</version>
<classifier>linuxathena</classifier>
</dependency>
<dependency>
<groupId>edu.wpi.first.thirdparty.frc2019.opencv</groupId>
<artifactId>opencv-jni</artifactId>
<version>3.4.4-5</version>
<classifier>linuxraspbian</classifier>
</dependency>
>>>>>>> folderStructure
</dependencies>
</project>