From 83b8a173acdb0183051ed83e230d062a36283e1a Mon Sep 17 00:00:00 2001
From: wusheng <wu.sheng@foxmail.com>
Date: Sat, 25 Feb 2017 20:07:49 +0800
Subject: [PATCH] Manual merge.

---
 .../com/a/eye/skywalking/collector/actor/AbstractWorker.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/skywalking-collector/skywalking-collector-actor/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorker.java b/skywalking-collector/skywalking-collector-actor/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorker.java
index fb1bdaa5e..2f26c690e 100644
--- a/skywalking-collector/skywalking-collector-actor/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorker.java
+++ b/skywalking-collector/skywalking-collector-actor/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorker.java
@@ -41,14 +41,9 @@ public abstract class AbstractWorker<T> extends UntypedActor {
         }
     }
 
-<<<<<<< HEAD
-    protected void tell(String workerRole, WorkerRouter router, Object message) throws Throwable {
-        router.find(workerRole).tell(message, getSelf());
-=======
     public void tell(AbstractWorkerProvider targetWorkerProvider, WorkerSelector selector, T message) throws Throwable {
         List<ActorRef> avaibleWorks = WorkersRefCenter.INSTANCE.availableWorks(targetWorkerProvider.roleName());
         selector.select(avaibleWorks, message).tell(message, getSelf());
->>>>>>> e93c6a65c448419bb87c0777b3c42dfc425d533b
     }
 
     void register(Member member) {