diff options
| author | Robert Newson <rnewson@apache.org> | 2014-05-14 15:55:49 +0100 |
|---|---|---|
| committer | Robert Newson <rnewson@apache.org> | 2014-05-14 15:55:49 +0100 |
| commit | d1cdd0976bb2034b95be729470fbd0192de68946 (patch) | |
| tree | 04fa2727b4de603797bdcead08252c7b715d7f7c /rebar.config.script | |
| parent | 0afec9a44c96acf0dd34d99c2d9cc600f25b5401 (diff) | |
| download | couchdb-d1cdd0976bb2034b95be729470fbd0192de68946.tar.gz | |
mem3 did not need merging
Diffstat (limited to 'rebar.config.script')
| -rw-r--r-- | rebar.config.script | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rebar.config.script b/rebar.config.script index 024bf7b43..e066130b8 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -29,7 +29,7 @@ DepDescs = [ {fabric, "couchdb-fabric", {branch, "master"}}, {ibrowse, "couchdb-ibrowse", {tag, "CouchDB-1.1.0"}}, {jiffy, "couchdb-jiffy", {branch, "master"}}, - {mem3, "couchdb-mem3", {branch, "1843-feature-bigcouch"}}, + {mem3, "couchdb-mem3", {branch, "master"}}, {mochiweb, "couchdb-mochiweb", {branch, "master"}}, {oauth, "couchdb-oauth", {branch, "1843-feature-bigcouch"}}, {rexi, "couchdb-rexi", {branch, "master"}}, |