Merge pull request #2163 from Hourier/Remove-Unnecessary-Braces

author Hourier <66951241+Hourier@users.noreply.github.com>

Mon, 14 Feb 2022 12:49:52 +0000 (21:49 +0900)

committer GitHub <noreply@github.com>

Mon, 14 Feb 2022 12:49:52 +0000 (21:49 +0900)
author Hourier <66951241+Hourier@users.noreply.github.com>
Mon, 14 Feb 2022 12:49:52 +0000 (21:49 +0900)
committer GitHub <noreply@github.com>
Mon, 14 Feb 2022 12:49:52 +0000 (21:49 +0900)
diff --cc src/maid-x11.cpp
Simple merge
diff --cc src/main-x11.cpp
Simple merge
diff --cc src/main.cpp
Simple merge
author	Hourier <66951241+Hourier@users.noreply.github.com>
	Mon, 14 Feb 2022 12:49:52 +0000 (21:49 +0900)
committer	GitHub <noreply@github.com>
	Mon, 14 Feb 2022 12:49:52 +0000 (21:49 +0900)
		1	2
src/maid-x11.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/main-x11.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/main.cpp	patch \|	diff1 \|	diff2 \|	blob \| history