Resolve conflicts from git rebase main

This commit is contained in:
Andrew Scott 2021-12-17 23:19:27 -05:00
parent c0b16d84d0
commit 9b0257ee5d
Signed by: a
GPG key ID: 3EB62D0BBB8DB381

View file

@ -133,4 +133,3 @@ click-right =
;throttle-output = 5 ;throttle-output = 5
;throttle-output-for = 10 ;throttle-output-for = 10
;screenchange-reload = false ;screenchange-reload = false
;