From 0cfd5e43a8d8dbbc2407331de170231db78c0858 Mon Sep 17 00:00:00 2001
From: Manuel Araoz <manuelaraoz@gmail.com>
Date: Thu, 24 Jul 2014 18:02:42 -0300
Subject: [PATCH] fix merge

---
 lib/NetworkMonitor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/NetworkMonitor.js b/lib/NetworkMonitor.js
index e074a89..b9a9b68 100644
--- a/lib/NetworkMonitor.js
+++ b/lib/NetworkMonitor.js
@@ -41,12 +41,12 @@ NetworkMonitor.prototype.init = function() {
     var tx = info.message.tx;
     self.emit('tx', tx);
     
-    var from = tx.getSendingAddresses(self.config.networkName);
+    var from = tx.getSendingAddresses(self.networkName);
     for (var i = 0; i < from.length; i++) {
       var addr = from[i];
       self.emit('out:'+addr, tx);
     }
-    var to = tx.getReceivingAddresses(self.config.networkName); 
+    var to = tx.getReceivingAddresses(self.networkName); 
     for (var i = 0; i < to.length; i++) {
       var addr = to[i];
       self.emit('in:'+addr, tx);