From: W. Trevor King <wking@tremily.us>
Date: Thu, 31 Oct 2013 16:01:30 +0000 (-0700)
Subject: Merge branch 'namespaced' of git://tremily.us/swc-modular-shell-hearing into assembled
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6393d2b89d2f154db710a57c8f032895b3ed73db;p=swc-boot-camp.git

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
---

6393d2b89d2f154db710a57c8f032895b3ed73db