diff options
| author | Marek Kotewicz <marek.kotewicz@gmail.com> | 2015-01-26 23:45:12 +0800 |
|---|---|---|
| committer | Marek Kotewicz <marek.kotewicz@gmail.com> | 2015-01-26 23:45:12 +0800 |
| commit | c5610398d54f98f3927f81f826cdb9b789d9d9f2 (patch) | |
| tree | 9ddbc7b25bcc13c2b4f16dd49b7074972904d236 | |
| parent | a7f4448f345b9c1df372b7da7dfe37a837bd877c (diff) | |
| parent | 063f69d51d6a8a703d2f4a4eadcbb3c35f870c91 (diff) | |
| download | go-tangerine-c5610398d54f98f3927f81f826cdb9b789d9d9f2.tar.gz go-tangerine-c5610398d54f98f3927f81f826cdb9b789d9d9f2.tar.zst go-tangerine-c5610398d54f98f3927f81f826cdb9b789d9d9f2.zip | |
Merge branch 'master' into sync
Conflicts:
lib/websocket.js
| -rw-r--r-- | lib/web3.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/web3.js b/lib/web3.js index 96002a232..33e92ea92 100644 --- a/lib/web3.js +++ b/lib/web3.js @@ -144,7 +144,7 @@ var shhWatchMethods = function () { return [ { name: 'newFilter', call: 'shh_newFilter' }, { name: 'uninstallFilter', call: 'shh_uninstallFilter' }, - { name: 'getMessage', call: 'shh_getMessages' } + { name: 'getMessages', call: 'shh_getMessages' } ]; }; |