From af1ad82c8eb823c054cf1ba40c7c3b6b61c45fce Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Sun, 13 Nov 2016 23:12:17 +0100
Subject: [PATCH] Fix merge issue

---
 gateway/samechannel/samechannel.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gateway/samechannel/samechannel.go b/gateway/samechannel/samechannel.go
index 47dfeb99..a4777a60 100644
--- a/gateway/samechannel/samechannel.go
+++ b/gateway/samechannel/samechannel.go
@@ -54,7 +54,7 @@ func (gw *SameChannelGateway) handleReceive(c chan config.Message) {
 	}
 }
 
-func (gw *SameChannelGateway) handleMessage(msg config.Message, dest bridge.Bridge) {
+func (gw *SameChannelGateway) handleMessage(msg config.Message, dest *bridge.Bridge) {
 	// is this a configured channel
 	if !gw.validChannel(msg.Channel) {
 		return