Nicolas SANS f64264631e Merge branch 'develop' of ssh://git.lab-ouest.org:8022/Epitech/T-IOT-901_convoyor into feat/main-algo ...

# Conflicts:
#	config.ini
#	include/Program.h
#	lib/NFC/src/NfcReader.cpp
#	src/Program.cpp

2024-01-26 09:46:49 +01:00

..

src

Merge branch 'develop' of ssh://git.lab-ouest.org:8022/Epitech/T-IOT-901_convoyor into feat/main-algo

2024-01-26 09:46:49 +01:00