projects / wakeup.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dbf413a 8dd5261)
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)
1  2 
src/lightswitch.c patch | diff1 | diff2 | blob | history

diff --cc src/lightswitch.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.