Commit 6767e8c922720fc59bca1fad2cf3709122e38ba0

Authored by zhangqijia
2 parents 0249f51b d36fbbd1

Merge branch 'master' of 120.26.43.151:zhangqijia/Pro2dProtoBuffers

 Conflicts:
	game.proto
Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
@@ -132,6 +132,6 @@ message EmailDelRsp { @@ -132,6 +132,6 @@ message EmailDelRsp {
132 repeated string ids = 1; 132 repeated string ids = 1;
133 } 133 }
134 134
135 -message EmailNewNty{ 135 +message EmailNewNty {
136 models.Email email = 1; 136 models.Email email = 1;
137 } 137 }