interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into sync 

Conflicts:
	lib/websocket.js
This commit is contained in:
Marek Kotewicz 2015-01-26 16:45:12 +01:00
parent a7f4448f34 063f69d51d
commit c5610398d5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/web3.js
View File

@ -144,7 +144,7 @@ var shhWatchMethods = function () {
return [ return [
{ name: 'newFilter', call: 'shh_newFilter' }, { name: 'newFilter', call: 'shh_newFilter' },
{ name: 'uninstallFilter', call: 'shh_uninstallFilter' }, { name: 'uninstallFilter', call: 'shh_uninstallFilter' },
{ name: 'getMessage', call: 'shh_getMessages' } { name: 'getMessages', call: 'shh_getMessages' }
]; ];
}; };