Fix merge conflicts in pulling doc fixes from 0.13.1 into 0.13 branch.

This commit is contained in:
Josh Suereth
2014-03-06 10:10:38 -05:00
parent 0e2d789290
commit 0a8d844071
5 changed files with 26 additions and 24 deletions
@@ -115,7 +115,6 @@ public class ForkMain {
final ObjectOutputStream os = new ObjectOutputStream(socket.getOutputStream());
// Must flush the header that the constructor writes, otherwise the ObjectInputStream on the other end may block indefinitely
os.flush();
try {
new Run().run(is, os);
} finally {