aboutsummaryrefslogtreecommitdiffstats
path: root/lib/web3.js
diff options
context:
space:
mode:
authorMarek Kotewicz <marek.kotewicz@gmail.com>2015-01-09 19:57:03 +0800
committerMarek Kotewicz <marek.kotewicz@gmail.com>2015-01-09 19:57:03 +0800
commita5907a8239c2d60ee5491ae2a33b105480798c6a (patch)
tree7dbc6ce1febbc8140b6095ab26b7adc4bd465736 /lib/web3.js
parent2a6c84984aace51e64fe87ca6770da0208b3b65f (diff)
parentc9015e2e04729a06cbcfd650ebfb0c1e71d96ce3 (diff)
downloaddexon-a5907a8239c2d60ee5491ae2a33b105480798c6a.tar
dexon-a5907a8239c2d60ee5491ae2a33b105480798c6a.tar.gz
dexon-a5907a8239c2d60ee5491ae2a33b105480798c6a.tar.bz2
dexon-a5907a8239c2d60ee5491ae2a33b105480798c6a.tar.lz
dexon-a5907a8239c2d60ee5491ae2a33b105480798c6a.tar.xz
dexon-a5907a8239c2d60ee5491ae2a33b105480798c6a.tar.zst
dexon-a5907a8239c2d60ee5491ae2a33b105480798c6a.zip
Merge branch 'master' of https://github.com/ethereum/ethereum.js
Diffstat (limited to 'lib/web3.js')
-rw-r--r--lib/web3.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/web3.js b/lib/web3.js
index b240bdae2..9a85c4d1b 100644
--- a/lib/web3.js
+++ b/lib/web3.js
@@ -505,4 +505,5 @@ function messageHandler(data) {
}
}
-module.exports = web3;
+if (typeof(module) !== "undefined")
+ module.exports = web3;