Permalink
Browse files

Merge branch 'master' of git@github.com:olegp/common-node.git

Conflicts:
	examples/chat.js
  • Loading branch information...
2 parents cbc3544 + edee7e3 commit 1a1fcb98c00f92a13be00a36166f35dc738ffe23 @olegp committed Sep 7, 2011
Showing with 2 additions and 2 deletions.
  1. +1 −1 README.md
  2. +1 −1 examples/chat.js
View
@@ -134,7 +134,7 @@ To contribute to this project, you can start by trying to run the tests on your
If you run into any issues along the way, whether related to using this library
in your own project or to the documentation, please post your comments on the [issue tracker](https://github.com/olegp/common-node/issues/). The tracker is also a great place to contribute ideas and find out what needs doing.
-If you're coming from Ringo or Narwhal, please try running the tests for some of your existing packages. If the tests pass and the packages is compatible with Common Node, feel free to add it to the [wiki](https://github.com/olegp/common-node/wiki).
+If you're coming from Ringo or Narwhal, please try running the tests for some of your existing packages. If the tests pass and the package is compatible with Common Node, feel free to add it to the [wiki](https://github.com/olegp/common-node/wiki).
To find specific issues not listed on the tracker, you can run the following command from inside the `common-node` directory.
View
@@ -13,4 +13,4 @@ while(clients.push(client = server.accept().getStream())) {
}
clients.splice(clients.indexOf(stream), 1);
});
-}
+}

0 comments on commit 1a1fcb9

Please sign in to comment.