diff options
| author | Robert Newson <rnewson@apache.org> | 2014-05-06 18:10:38 +0100 |
|---|---|---|
| committer | Robert Newson <rnewson@apache.org> | 2014-05-06 18:10:38 +0100 |
| commit | 694e3f35801cc2ff65fcae7bb19bea75920d1433 (patch) | |
| tree | 0f504ddd2f8cda689c3ef668008433e3ab067b73 | |
| parent | 431d9b624a744523ff2e63c3600df0a7f0f30609 (diff) | |
| download | couchdb-694e3f35801cc2ff65fcae7bb19bea75920d1433.tar.gz | |
config did not need merging
| -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 55876c5f6..a4865e51c 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -18,7 +18,7 @@ os:putenv("COUCHDB_CONFIG", ConfigureEnv). DepDescs = [ {couch_log, "couchdb-couch-log", {branch, "master"}}, - {config, "couchdb-config", {branch, "1843-feature-bigcouch"}}, + {config, "couchdb-config", {branch, "master"}}, {chttpd, "couchdb-chttpd", {branch, "master"}}, {couch, "couchdb-couch", {branch, "master"}}, {couch_index, "couchdb-couch-index", {branch, "1843-feature-bigcouch"}}, |