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 'dev' of https://gitlab.com/chameleon-vision/Chameleon-Vision into dev

Browse Source 
# Conflicts:
#	chameleon-client/src/views/CameraViewes/OutputTab.vue
This commit is contained in:
Omer
2019-10-30 14:34:19 +02:00
parent 120fa64f3c 1e02f114e1
commit bb49cddd1a
30 changed files with 737 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Main/pom.xml
View File

@@ -75,7 +75,7 @@
<!--slf4j for javalin -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<artifactId>slf4j-nop</artifactId>
<version>1.7.26</version>
</dependency>