Jim LAURIE 26dfc9ae1b docs: fix conflicts ...

Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>

2020-02-20 14:48:03 +01:00

..

contributing.md

docs: udpate some wording

2020-02-20 14:43:07 +01:00

installation.md

docs: udpate some wording

2020-02-20 14:43:07 +01:00

introduction.md

docs: udpate some wording

2020-02-20 14:43:07 +01:00

quick-start-tutorial.md

Grammar and consitent punctuation

2020-02-08 19:58:12 +01:00

quick-start.md

Merge branch 'master' into patch-1

2020-02-08 20:03:38 +01:00

troubleshooting.md

docs: udpate some wording

2020-02-20 14:43:07 +01:00