Add notes so we have a merge conflict.

Conflicts:
	notes/0.13.6.md
This commit is contained in:
Josh Suereth 2014-08-01 17:20:03 -04:00 committed by Eugene Yokota
parent f4ff84db34
commit 5150339a0a
1 changed files with 2 additions and 0 deletions

View File

@ -35,6 +35,7 @@
[1477]: https://github.com/sbt/sbt/pull/1477
[1486]: https://github.com/sbt/sbt/pull/1486
[1487]: https://github.com/sbt/sbt/pull/1487
[1488]: https://github.com/sbt/sbt/pull/1488
[@dansanduleac]: https://github.com/dansanduleac
[@2m]: https://github.com/2m
[@pvlugter]: https://github.com/pvlugter
@ -80,6 +81,7 @@
- Works around "Not a simple type" breaking `-Xfatal-warnings`. [#1477][1477] by [@puffnfresh][@puffnfresh]
- Fixes sLog usage in tandem with the `set` comamnd [#1486][1486] [@jsuereth][@jsuereth]
- Test suites with whitespace will have prettier filenames [#1487][1487] [@jsuereth][@jsuereth]
- sbt no longer crashes when run in root directory [#1488][1488] by [@jsuereth][@jsuereth]
### enablePlugins/disablePlugins