summaryrefslogtreecommitdiff
path: root/bootloader
diff options
context:
space:
mode:
authormabuch <marcel.buechler@gmail.com>2022-04-18 14:35:31 +0200
committermabuch <marcel.buechler@gmail.com>2022-04-18 14:35:31 +0200
commit82a4f9aa68c3f8d5f3cfa6de87de078fe680d944 (patch)
treecc83c0af796a029f9464003cda043f373b716749 /bootloader
parentea14c580ca6296cb93facf526d65a2db0e3ff1b0 (diff)
parent2607c3d79947e900ce4c5ded296f649677511a34 (diff)
resolved merge conflict after renaming PineTimeStyle to WatchFacePineTimeStyle
Diffstat (limited to 'bootloader')
0 files changed, 0 insertions, 0 deletions