Merge pull request #43 from TheBlueMatt/2021-12-0.0.104

author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>

Tue, 11 Jan 2022 18:44:36 +0000 (18:44 +0000)

committer GitHub <noreply@github.com>

Tue, 11 Jan 2022 18:44:36 +0000 (18:44 +0000)
author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Tue, 11 Jan 2022 18:44:36 +0000 (18:44 +0000)
committer GitHub <noreply@github.com>
Tue, 11 Jan 2022 18:44:36 +0000 (18:44 +0000)
diff --cc src/cli.rs
Simple merge
diff --cc src/main.rs
Simple merge
author	Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
	Tue, 11 Jan 2022 18:44:36 +0000 (18:44 +0000)
committer	GitHub <noreply@github.com>
	Tue, 11 Jan 2022 18:44:36 +0000 (18:44 +0000)
		1	2
src/cli.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/main.rs	patch \|	diff1 \|	diff2 \|	blob \| history