John Mulhausen e44ca4b758 Fix merge conflicts

2016-11-28 14:22:14 -08:00

..

images

Convert TOML to YAML, tweaks to work with Jekyll

2016-09-29 17:16:03 -07:00

index.md

fix type of keywords entry in frontmatter (in /opensource/) (#516)

2016-11-10 11:58:22 -08:00

set-up-dev-env.md

fix type of keywords entry in frontmatter (in /opensource/) (#516)

2016-11-10 11:58:22 -08:00

set-up-git.md

fix type of keywords entry in frontmatter (in /opensource/) (#516)

2016-11-10 11:58:22 -08:00

software-req-win.md

Fix merge conflicts

2016-11-28 14:22:14 -08:00

software-required.md

fix type of keywords entry in frontmatter (in /opensource/) (#516)

2016-11-10 11:58:22 -08:00

test-and-docs.md

fix type of keywords entry in frontmatter (in /opensource/) (#516)

2016-11-10 11:58:22 -08:00

who-written-for.md

fix type of keywords entry in frontmatter (in /opensource/) (#516)

2016-11-10 11:58:22 -08:00