Terence Tsao f3517ee338 sharding/proposer: resolve merge conflicts ... Former-commit-id: 928ef8cac10f54f82f3afdcf6ae80f98695d8f80 [formerly 0f29fa1b85f089e561004fb2699891d8d17b536e] Former-commit-id: af058dcd40c5aff1f3a27492d33c704e2d77be20		2018-06-10 09:13:57 -07:00
..
notary.go	merge with master	2018-06-06 21:59:11 -07:00
service_test.go	sharding/proposer: refactor based on new architecture	2018-06-06 23:03:54 -07:00
service.go	sharding/node: use ethdb.Database, remove database.ShardBackend	2018-06-08 14:45:26 -07:00