Johannes Wendel 40ee54a1f8 resolved merge conflict

2019-08-01 20:32:50 +02:00

..

Display_Config.json

fuuuuuuuu

2019-07-16 22:12:46 +02:00

Lamp_Config.json

Added wiringPi substitute for testing purposes on other systems.

2019-07-17 09:36:33 +02:00

Solenoid_Config.json

fuuuuuuuu

2019-07-16 22:12:46 +02:00

Sound_Config.json

resolved merge conflict

2019-08-01 20:32:50 +02:00