Merge branch 'namespaced' of git://tremily.us/swc-modular-shell-hearing into assembled
authorW. Trevor King <wking@tremily.us>
Thu, 31 Oct 2013 16:01:30 +0000 (09:01 -0700)
committerW. Trevor King <wking@tremily.us>
Thu, 31 Oct 2013 16:01:30 +0000 (09:01 -0700)
commit6393d2b89d2f154db710a57c8f032895b3ed73db
treec28defe9192be346cb30e96409522019fd485f4b
parent70ffe3dbc5a0e69dc3ba293ec647a1ad56898d5d
parent25a3f547fb35dc6e2e7fa984f73f71cba57f0eff
Merge branch 'namespaced' of git://tremily.us/swc-modular-shell-hearing into assembled

Avoid problems due to the shared history of swc-modular-shell,
swc-modular-shell-hello, and swc-modular-shell-hearing by restoring
the subject-level files and hello script removed in
swc-modular-shell-hearing:

  $ git checkout HEAD -- modular/shell/{README.md,cheat-sheet.md,instructor.md,exercises/hello/hello}

before commiting the merge.

Conflicts:
modular/shell/cheat-sheet.md
modular/shell/exercises/hello/hello