From 57326fb4942281109d21fef403f51867c8f984f7 Mon Sep 17 00:00:00 2001
From: John Christopher Anderson <jchris@apache.org>
Date: Sat, 27 Jun 2009 14:32:36 +0000
Subject: removed some dead code found by Dialyzer, more to come

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@788979 13f79535-47bb-0310-9956-ffa450edef68
---
 src/couchdb/couch_key_tree.erl | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/couchdb/couch_key_tree.erl')

diff --git a/src/couchdb/couch_key_tree.erl b/src/couchdb/couch_key_tree.erl
index d983e20f..87313ff0 100644
--- a/src/couchdb/couch_key_tree.erl
+++ b/src/couchdb/couch_key_tree.erl
@@ -29,12 +29,8 @@ merge(A, B) ->
     {Merged, HasConflicts} = 
     lists:foldl(
         fun(InsertTree, {AccTrees, AccConflicts}) ->
-            case merge_one(AccTrees, InsertTree, [], false) of
-            {ok, Merged, Conflicts} ->
-                {Merged, Conflicts or AccConflicts};
-            no ->
-                {[InsertTree | AccTrees], true} 
-            end
+            {ok, Merged, Conflicts} = merge_one(AccTrees, InsertTree, [], false),
+            {Merged, Conflicts or AccConflicts}
         end,
         {A, false}, B),
     if HasConflicts or 
-- 
cgit v1.2.3