From 3376ea078de97b353dc72b8de42ff64f0c92d0ff Mon Sep 17 00:00:00 2001
From: v2ray <admin@v2ray.com>
Date: Sun, 5 Jun 2016 23:42:16 +0200
Subject: [PATCH] merge conflict

---
 shell/point/inbound_detour_dynamic.go | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/shell/point/inbound_detour_dynamic.go b/shell/point/inbound_detour_dynamic.go
index 800c2d17..f22de50a 100644
--- a/shell/point/inbound_detour_dynamic.go
+++ b/shell/point/inbound_detour_dynamic.go
@@ -117,21 +117,6 @@ func (this *InboundDetourHandlerDynamic) refresh() error {
 	this.ichs = newIchs
 	this.Unlock()
 
-<<<<<<< HEAD
-	go func(recycles []proxy.InboundHandler) {
-		time.Sleep(time.Minute)
-		for _, ich := range recycles {
-			if ich == nil {
-				continue
-			}
-			port := ich.Port()
-			ich.Close()
-			delete(this.portsInUse, port)
-		}
-	}(ich2Recycle)
-
-=======
->>>>>>> 045e1dcc5329b68fee3fc0f94b1c50d6ee303b27
 	return nil
 }