Merge pull request #215 from hmtheboy154/master

author Braden Farmer <farmerbb@gmail.com>

Tue, 28 Sep 2021 06:06:38 +0000 (00:06 -0600)

committer GitHub <noreply@github.com>

Tue, 28 Sep 2021 06:06:38 +0000 (00:06 -0600)
author Braden Farmer <farmerbb@gmail.com>
Tue, 28 Sep 2021 06:06:38 +0000 (00:06 -0600)
committer GitHub <noreply@github.com>
Tue, 28 Sep 2021 06:06:38 +0000 (00:06 -0600)
diff --cc app/src/main/java/com/farmerbb/taskbar/ui/TaskbarController.java
Simple merge
diff --cc app/src/main/java/com/farmerbb/taskbar/util/U.java
Simple merge
author	Braden Farmer <farmerbb@gmail.com>
	Tue, 28 Sep 2021 06:06:38 +0000 (00:06 -0600)
committer	GitHub <noreply@github.com>
	Tue, 28 Sep 2021 06:06:38 +0000 (00:06 -0600)
		1	2
app/src/main/java/com/farmerbb/taskbar/ui/TaskbarController.java	patch \|	diff1 \|	diff2 \|	blob \| history
app/src/main/java/com/farmerbb/taskbar/util/U.java	patch \|	diff1 \|	diff2 \|	blob \| history