diff options
| author | varac <varacanero@zeromail.org> | 2013-08-29 19:42:56 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-08-29 19:42:56 +0200 |
| commit | 7ec54bd92bc63e1d7a5213196c1b4fb1bbe1b0b4 (patch) | |
| tree | ae7ceba336f8d3c1a5bf40cd8e6ba2115f21aea4 /puppet/modules | |
| parent | 7240764c9f1f319a002eb63f7a2dc26a2d479d31 (diff) | |
updated submodule couchdb, fixed merge resolution error from last merge
Diffstat (limited to 'puppet/modules')
| m--------- | puppet/modules/couchdb | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/puppet/modules/couchdb b/puppet/modules/couchdb -Subproject 32a0f9df6e80c15b3b49b8ad81b9a49ecc6f39d +Subproject ca467f2c8ec25132133e058f446217828b93267 |