fix for confilict
authorroot <root@localhost.localdomain>
Wed, 8 Aug 2018 02:26:00 +0000 (10:26 +0800)
committerroot <root@localhost.localdomain>
Wed, 8 Aug 2018 02:26:00 +0000 (10:26 +0800)
commit84331a0ddbc86567f1a0756f6054559309d82144
tree1efcc826267b886f62752d3f51775587cdc1a026
parent6a3312977131576bbf1575e9d697b5bb817591b9
fix for confilict
src/brpc/controller.h