Commit b3dbf761 authored by Jon Pye's avatar Jon Pye
Browse files

Merge remote-tracking branch 'origin/master'

Conflicts:
	install_reqs.md
parents 42dee837 0fb21b6d
......@@ -43,7 +43,6 @@ Getting Git:
Your OS might not have git pre-installed. Download git from http://git-scm.com/download/ and install it. Select Use git from the Command Window when installing to Windows to let you use Git from the command line.
Mac and Linux:
Installing packages from Git:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment