merge conflict resolve

This commit is contained in:
jcolebrand 2019-12-26 23:16:39 -06:00
commit 04e7a2ca0e

1
_config.yml Normal file
View File

@ -0,0 +1 @@
theme: jekyll-theme-slate