Skip to content

Commit

Permalink
Fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
neumino committed Jan 26, 2014
2 parents 616cdfe + 7f92a32 commit 93d3cc1
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Status: Beta


### Quick start ###
=============
-------------

Example wih [koa](https://github.com/koajs/koa):

Expand Down Expand Up @@ -49,7 +49,7 @@ Note: You have to start node with the `--harmony` flag.


### Install ###
=============
-------------
- Build node 0.11.10 (checkout `v0.11.10-release`) from source.
Binaries won't work with `node-protobuf` -- some libraries are not properly linked.
- Install the `libprotobuf` binary and development files (required to build `node-protobuf` in the next step).
Expand All @@ -61,7 +61,7 @@ npm install rethinkdbdash


### Documentation ###
=============
-------------
While rethinkdbdash has almost the same syntax as the official driver, there are still
a few differences.

Expand Down Expand Up @@ -241,7 +241,7 @@ error, an atom, or the end (or full) sequence.
A connection can also emit a "timeout" event if the underlying connection times out.
### Run tests ###
============
-------------
Update `test/config.js` if your RethinkDB instance doesn't run on the default parameters.
Expand Down

0 comments on commit 93d3cc1

Please sign in to comment.