From 7ec54bd92bc63e1d7a5213196c1b4fb1bbe1b0b4 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 29 Aug 2013 19:42:56 +0200
Subject: updated submodule couchdb, fixed merge resolution error from last
 merge

---
 puppet/modules/couchdb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'puppet/modules/couchdb/files')

diff --git a/puppet/modules/couchdb b/puppet/modules/couchdb
index 32a0f9df..ca467f2c 160000
--- a/puppet/modules/couchdb
+++ b/puppet/modules/couchdb
@@ -1 +1 @@
-Subproject commit 32a0f9df6e80c15b3b49b8ad81b9a49ecc6f39dd
+Subproject commit ca467f2c8ec25132133e058f446217828b932671
-- 
cgit v1.2.3