Commit b1df9ce3812425edc2a4470022bed2416e3250e9
Merge branch 'master' of 120.26.43.151:zhangqijia/Pro2dProtoBuffers
# Conflicts: # game.proto
Showing
1 changed file
with
2 additions
and
1 deletions
Show diff stats
game.proto
| @@ -105,7 +105,8 @@ message HeroUpLevelRsp { | @@ -105,7 +105,8 @@ message HeroUpLevelRsp { | ||
| 105 | models.Hero hero = 1; | 105 | models.Hero hero = 1; |
| 106 | } | 106 | } |
| 107 | 107 | ||
| 108 | -message EmailListReq {} | 108 | +message EmailListReq { |
| 109 | +} | ||
| 109 | 110 | ||
| 110 | message EmailListRsp { | 111 | message EmailListRsp { |
| 111 | repeated models.Email emails = 1; | 112 | repeated models.Email emails = 1; |