Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Several fixes to the main bootcamp page; added vignettes #2

Merged
merged 12 commits into from
Jan 25, 2014
Merged

Several fixes to the main bootcamp page; added vignettes #2

merged 12 commits into from
Jan 25, 2014

Conversation

rhiever
Copy link
Contributor

@rhiever rhiever commented Jan 25, 2014

Please merge this PR after the PR pulling over the ERDC boot camp materials is merged.

ahmadia added a commit that referenced this pull request Jan 25, 2014
Switch from gh-pages to development versions of shell and python materials
@ahmadia
Copy link
Contributor

ahmadia commented Jan 25, 2014

@rhiever - the instructor include files are gone, so I don't think https://github.com/rhiever/2014-01-30-mit-1/commit/9cf746db6514c191bdb6719be61a0773503dbe16 is relevant anymore. It looks like I did a few too many things, I'm going to manually merge and resubmit your suggested changes as a new PR.

@ahmadia ahmadia merged commit a2b48a2 into geocarpentry:gh-pages Jan 25, 2014
@ahmadia
Copy link
Contributor

ahmadia commented Jan 25, 2014

I pushed these in manually.

ahmadia pushed a commit that referenced this pull request Jan 28, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants