Merge branch 'develop' of https://github.com/tronprotocol/java-tron i…

…nto develop # Conflicts: # src/main/protos/core/Tron.proto
tronprotocol · Apr 26, 2018 · 3464107 · 3464107
2 parents f5e7632 + 479564d
commit 3464107
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/core/Tron.proto b/core/Tron.proto
@@ -31,7 +31,6 @@ message Account {
     // the vote num to this super rep.
     int64 vote_count = 2;
   }
-
   bytes account_name = 1;
   AccountType type = 2;
   // the create adress
@@ -53,6 +52,7 @@ message Account {
 message acuthrity {
   AccountId account = 1;
   bytes permission_name = 2;
+
 }