Commit Graph

4 Commits

Author SHA1 Message Date
John Mertz 00eef39441
Fix merge conflicts 2023-01-07 13:32:14 -05:00
John Mertz 6cbadb5d5d
ts4 2023-01-07 08:17:43 -05:00
John Mertz 6d33d9446f tabs->spaces 2023-01-06 14:41:31 -05:00
John Mertz abc0b9f097 Merge branch 'master' of ssh://git@git.john.me.tz:223/jpm/scripts.git
Conflicts:
	send-to-kodi.sh
	sway/displays.pl
	sway/idle.sh
	sway/idlecountdown.sh
	sway/startsway.sh
	waybar/waybar-fedora-silverblue.sh
	wofi/wofi-alt-tab.sh
2022-11-04 11:09:07 -04:00