From 6a02e6d001a3e503fb14eb01019f97cb387b6807 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 15 Jul 2015 16:23:23 -0700
Subject: [PATCH] resolve final conflict in Application

---
 interface/src/Application.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 60e7c957f1..1fc0bf19b5 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3952,9 +3952,6 @@ int Application::processOctreeStats(NLPacket& packet, SharedNodePointer sendingN
         qCDebug(interfaceapp, "stats from new %s server... [%f, %f, %f, %f]",
                 qPrintable(serverType),
                 (double)rootDetails.x, (double)rootDetails.y, (double)rootDetails.z, (double)rootDetails.s);
-        } else {
-            jurisdiction->unlock();
-        }
     } else {
         jurisdiction->unlock();
     }