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.

Sign up for GitHub

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

Jump to bottom

Don't generate SSH key; Run tasks as root; Properly check for correct editor #26

Open

chrohrer wants to merge 5 commits into AAROC:master from chrohrer:addis

Contributor

chrohrer commented Oct 30, 2017

… editor

Chris Rohrer added 5 commits

October 30, 2017 21:33


          Don't generate SSH key; Run tasks as root; Properly check for correct…

… editor


          Another server, another step towards a Github shirt

de1bd51


          Comment out Slack

1d980af


          Merge branch 'upstream' into addis


          Individual user files

212daf5

Member

brucellino commented Oct 31, 2017

@chrohrer I'm going to resolve the conflicts by keeping the latest additions to the training-lab.yml

I suggest that you send a PR with a slightly modified training-lab-{{ site_name }}.yml ie training-lab-addis.yml that will avoid the conflict.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet