resolve merge conflict master
authorArjen Baart <arjen@andromeda.nl>
Thu, 1 Apr 2021 05:38:31 +0000 (07:38 +0200)
committerArjen Baart <arjen@andromeda.nl>
Thu, 1 Apr 2021 05:38:31 +0000 (07:38 +0200)
commitafe6e2d871bed196a9a800dd4c7e06d150169a1d
tree9468456f0d438dfbb315a4689128260ce0acb4c2
parentdbf413ae7f20a2a30fb53c45559033b7f21bf4d8
parent8dd5261b00a06b19f8f1a313de4786920160d759
resolve merge conflict
src/lightswitch.c