-
Alexandre Manoury authored
Conflicts: simulation/qtcreator-files/paprikaSimulateur/paprikaSimulateur.pro stm32/include/hardware/microSwitch.h stm32/src/strategie/krabi2015.cpp stm32/src/strategie/ramasserPied.cpp
93899510
Conflicts: simulation/qtcreator-files/paprikaSimulateur/paprikaSimulateur.pro stm32/include/hardware/microSwitch.h stm32/src/strategie/krabi2015.cpp stm32/src/strategie/ramasserPied.cpp