Merge branch 'remove-linker-scheme-option' into 'develop'

author feld <feld@feld.me>

Wed, 5 Feb 2020 20:32:45 +0000 (20:32 +0000)

committer feld <feld@feld.me>

Wed, 5 Feb 2020 20:32:45 +0000 (20:32 +0000)
author feld <feld@feld.me>
Wed, 5 Feb 2020 20:32:45 +0000 (20:32 +0000)
committer feld <feld@feld.me>
Wed, 5 Feb 2020 20:32:45 +0000 (20:32 +0000)
diff --cc config/config.exs
Simple merge
diff --cc config/description.exs
Simple merge
		1	2
config/config.exs	patch \|	diff1 \|	diff2 \|	blob \| history
config/description.exs	patch \|	diff1 \|	diff2 \|	blob \| history