sbt/notes
Josh Suereth 5150339a0a Add notes so we have a merge conflict.
Conflicts:
	notes/0.13.6.md
2014-08-01 17:37:12 -04:00
..
0.13.6.md Add notes so we have a merge conflict. 2014-08-01 17:37:12 -04:00
about.md Consolidated resolution. Fixes #413 2014-07-24 02:12:46 -04:00