rpc: fix formatting errors from merge conflicts

This commit is contained in:
Armani Ferrante 2017-11-16 14:58:20 -08:00
parent 3530d5ef40
commit 08f1dd5477